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 2014/02/26 19:49:48 UTC
[01/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Repository: cloudstack
Updated Branches:
refs/heads/acl-item-cidrs 00704ee68 -> e90d595d3
Findbugs: Fix Upgrade430to440.java:119, ES_COMPARING_STRINGS_WITH_EQ,
Priority: High
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d1efdca5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d1efdca5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d1efdca5
Branch: refs/heads/acl-item-cidrs
Commit: d1efdca50622a0b67ae1a286aad3297b1c748e9e
Parents: 52c4f00
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Feb 24 17:01:04 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Feb 24 17:01:04 2014 +0100
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1efdca5/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
index 3b967e7..f2cc5d3 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
@@ -23,9 +23,9 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import com.cloud.network.Network;
import org.apache.log4j.Logger;
+import com.cloud.network.Network;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@@ -116,7 +116,7 @@ public class Upgrade430to440 implements DbUpgrade {
if (networkRs.next()) {
String guesttype = networkRs.getString(1);
- if (guesttype == Network.GuestType.Shared.toString()) {
+ if (guesttype.equals(Network.GuestType.Shared.toString())) {
pstmtUpdate = conn.prepareStatement("UPDATE `cloud`.`user_ip_address` SET account_id = ?, domain_id= ? WHERE public_ip_address = ?");
pstmtUpdate.setLong(1,vmAccountId);
pstmtUpdate.setLong(2,vmDomainId);
[13/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Pool.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Pool.java b/deps/XenServerJava/src/com/xensource/xenapi/Pool.java
index 7ceebb0..8b5c94d 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Pool.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Pool.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Pool extends XenAPIObject {
* For internal use only.
*/
Pool(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Pool extends XenAPIObject {
{
if (obj != null && obj instanceof Pool)
{
- Pool other = (Pool)obj;
+ Pool other = (Pool) obj;
return other.ref.equals(this.ref);
} else
{
@@ -132,8 +133,8 @@ public class Pool extends XenAPIObject {
/**
* Convert a pool.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -280,15 +281,15 @@ public class Pool extends XenAPIObject {
* @return all fields from the object
*/
public Pool.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPoolRecord(result);
+ return Types.toPoolRecord(result);
}
/**
@@ -298,15 +299,15 @@ public class Pool extends XenAPIObject {
* @return reference to the object
*/
public static Pool getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPool(result);
+ return Types.toPool(result);
}
/**
@@ -315,15 +316,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -332,15 +333,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -349,15 +350,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -366,15 +367,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Host getMaster(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_master";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -383,15 +384,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public SR getDefaultSR(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_default_SR";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -400,15 +401,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public SR getSuspendImageSR(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_suspend_image_SR";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -417,15 +418,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public SR getCrashDumpSR(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_crash_dump_SR";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -434,15 +435,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -451,15 +452,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Boolean getHaEnabled(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_ha_enabled";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -468,15 +469,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getHaConfiguration(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_ha_configuration";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -485,15 +486,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Set<String> getHaStatefiles(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_ha_statefiles";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -502,15 +503,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Long getHaHostFailuresToTolerate(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_ha_host_failures_to_tolerate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -519,15 +520,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Long getHaPlanExistsFor(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_ha_plan_exists_for";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -536,15 +537,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Boolean getHaAllowOvercommit(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_ha_allow_overcommit";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -553,15 +554,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Boolean getHaOvercommitted(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_ha_overcommitted";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -570,15 +571,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Map<String, Blob> getBlobs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_blobs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringBlob(result);
+ return Types.toMapOfStringBlob(result);
}
/**
@@ -587,15 +588,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Set<String> getTags(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -604,15 +605,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getGuiConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_gui_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -621,15 +622,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public String getWlbUrl(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_wlb_url";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -638,15 +639,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public String getWlbUsername(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_wlb_username";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -655,15 +656,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Boolean getWlbEnabled(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_wlb_enabled";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -672,15 +673,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Boolean getWlbVerifyCert(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_wlb_verify_cert";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -689,15 +690,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Boolean getRedoLogEnabled(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_redo_log_enabled";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -706,15 +707,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public VDI getRedoLogVdi(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_redo_log_vdi";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -723,15 +724,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public String getVswitchController(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_vswitch_controller";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -740,15 +741,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getRestrictions(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_restrictions";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -757,15 +758,15 @@ public class Pool extends XenAPIObject {
* @return value of the field
*/
public Set<VDI> getMetadataVDIs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_metadata_VDIs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVDI(result);
+ return Types.toSetOfVDI(result);
}
/**
@@ -774,9 +775,9 @@ public class Pool extends XenAPIObject {
* @param nameLabel New value to set
*/
public void setNameLabel(Connection c, String nameLabel) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(nameLabel)};
@@ -790,9 +791,9 @@ public class Pool extends XenAPIObject {
* @param nameDescription New value to set
*/
public void setNameDescription(Connection c, String nameDescription) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(nameDescription)};
@@ -806,9 +807,9 @@ public class Pool extends XenAPIObject {
* @param defaultSR New value to set
*/
public void setDefaultSR(Connection c, SR defaultSR) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_default_SR";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(defaultSR)};
@@ -822,9 +823,9 @@ public class Pool extends XenAPIObject {
* @param suspendImageSR New value to set
*/
public void setSuspendImageSR(Connection c, SR suspendImageSR) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_suspend_image_SR";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(suspendImageSR)};
@@ -838,9 +839,9 @@ public class Pool extends XenAPIObject {
* @param crashDumpSR New value to set
*/
public void setCrashDumpSR(Connection c, SR crashDumpSR) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_crash_dump_SR";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(crashDumpSR)};
@@ -854,9 +855,9 @@ public class Pool extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -871,9 +872,9 @@ public class Pool extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -887,9 +888,9 @@ public class Pool extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -903,9 +904,9 @@ public class Pool extends XenAPIObject {
* @param haAllowOvercommit New value to set
*/
public void setHaAllowOvercommit(Connection c, Boolean haAllowOvercommit) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_ha_allow_overcommit";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(haAllowOvercommit)};
@@ -919,9 +920,9 @@ public class Pool extends XenAPIObject {
* @param tags New value to set
*/
public void setTags(Connection c, Set<String> tags) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(tags)};
@@ -935,9 +936,9 @@ public class Pool extends XenAPIObject {
* @param value New value to add
*/
public void addTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.add_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -951,9 +952,9 @@ public class Pool extends XenAPIObject {
* @param value Value to remove
*/
public void removeTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.remove_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -967,9 +968,9 @@ public class Pool extends XenAPIObject {
* @param guiConfig New value to set
*/
public void setGuiConfig(Connection c, Map<String, String> guiConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_gui_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(guiConfig)};
@@ -984,9 +985,9 @@ public class Pool extends XenAPIObject {
* @param value Value to add
*/
public void addToGuiConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.add_to_gui_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -1000,9 +1001,9 @@ public class Pool extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromGuiConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.remove_from_gui_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -1016,9 +1017,9 @@ public class Pool extends XenAPIObject {
* @param wlbEnabled New value to set
*/
public void setWlbEnabled(Connection c, Boolean wlbEnabled) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_wlb_enabled";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(wlbEnabled)};
@@ -1032,9 +1033,9 @@ public class Pool extends XenAPIObject {
* @param wlbVerifyCert New value to set
*/
public void setWlbVerifyCert(Connection c, Boolean wlbVerifyCert) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_wlb_verify_cert";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(wlbVerifyCert)};
@@ -1051,14 +1052,13 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task joinAsync(Connection c, String masterAddress, String masterUsername, String masterPassword) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.JoiningHostCannotContainSharedSrs {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.JoiningHostCannotContainSharedSrs {
String method_call = "Async.pool.join";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(masterAddress), Marshalling.toXMLRPC(masterUsername),
- Marshalling.toXMLRPC(masterPassword)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(masterAddress), Marshalling.toXMLRPC(masterUsername), Marshalling.toXMLRPC(masterPassword)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1072,14 +1072,13 @@ public class Pool extends XenAPIObject {
* @param masterPassword The password for the master (for initial authentication)
*/
public static void join(Connection c, String masterAddress, String masterUsername, String masterPassword) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.JoiningHostCannotContainSharedSrs {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.JoiningHostCannotContainSharedSrs {
String method_call = "pool.join";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(masterAddress), Marshalling.toXMLRPC(masterUsername),
- Marshalling.toXMLRPC(masterPassword)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(masterAddress), Marshalling.toXMLRPC(masterUsername), Marshalling.toXMLRPC(masterPassword)};
Map response = c.dispatch(method_call, method_params);
return;
}
@@ -1093,13 +1092,12 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task joinForceAsync(Connection c, String masterAddress, String masterUsername, String masterPassword) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.join_force";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(masterAddress), Marshalling.toXMLRPC(masterUsername),
- Marshalling.toXMLRPC(masterPassword)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(masterAddress), Marshalling.toXMLRPC(masterUsername), Marshalling.toXMLRPC(masterPassword)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1113,13 +1111,12 @@ public class Pool extends XenAPIObject {
* @param masterPassword The password for the master (for initial authentication)
*/
public static void joinForce(Connection c, String masterAddress, String masterUsername, String masterPassword) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.join_force";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(masterAddress), Marshalling.toXMLRPC(masterUsername),
- Marshalling.toXMLRPC(masterPassword)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(masterAddress), Marshalling.toXMLRPC(masterUsername), Marshalling.toXMLRPC(masterPassword)};
Map response = c.dispatch(method_call, method_params);
return;
}
@@ -1131,9 +1128,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task ejectAsync(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.eject";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host)};
@@ -1148,9 +1145,9 @@ public class Pool extends XenAPIObject {
* @param host The host to eject
*/
public static void eject(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.eject";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host)};
@@ -1163,9 +1160,9 @@ public class Pool extends XenAPIObject {
*
*/
public static void emergencyTransitionToMaster(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.emergency_transition_to_master";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1179,9 +1176,9 @@ public class Pool extends XenAPIObject {
* @param masterAddress The hostname of the master
*/
public static void emergencyResetMaster(Connection c, String masterAddress) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.emergency_reset_master";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(masterAddress)};
@@ -1195,9 +1192,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task recoverSlavesAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.recover_slaves";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1212,15 +1209,15 @@ public class Pool extends XenAPIObject {
* @return list of hosts whose master address were succesfully reset
*/
public static Set<Host> recoverSlaves(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.recover_slaves";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHost(result);
+ return Types.toSetOfHost(result);
}
/**
@@ -1232,10 +1229,10 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task createVLANAsync(Connection c, String device, Network network, Long VLAN) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VlanTagInvalid {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VlanTagInvalid {
String method_call = "Async.pool.create_VLAN";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(VLAN)};
@@ -1253,16 +1250,16 @@ public class Pool extends XenAPIObject {
* @return The references of the created PIF objects
*/
public static Set<PIF> createVLAN(Connection c, String device, Network network, Long VLAN) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VlanTagInvalid {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VlanTagInvalid {
String method_call = "pool.create_VLAN";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(VLAN)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPIF(result);
+ return Types.toSetOfPIF(result);
}
/**
@@ -1274,10 +1271,10 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task createVLANFromPIFAsync(Connection c, PIF pif, Network network, Long VLAN) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VlanTagInvalid {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VlanTagInvalid {
String method_call = "Async.pool.create_VLAN_from_PIF";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(pif), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(VLAN)};
@@ -1295,16 +1292,16 @@ public class Pool extends XenAPIObject {
* @return The references of the created PIF objects
*/
public static Set<PIF> createVLANFromPIF(Connection c, PIF pif, Network network, Long VLAN) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VlanTagInvalid {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VlanTagInvalid {
String method_call = "pool.create_VLAN_from_PIF";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(pif), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(VLAN)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPIF(result);
+ return Types.toSetOfPIF(result);
}
/**
@@ -1315,9 +1312,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task enableHaAsync(Connection c, Set<SR> heartbeatSrs, Map<String, String> configuration) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.enable_ha";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(heartbeatSrs), Marshalling.toXMLRPC(configuration)};
@@ -1333,9 +1330,9 @@ public class Pool extends XenAPIObject {
* @param configuration Detailed HA configuration to apply
*/
public static void enableHa(Connection c, Set<SR> heartbeatSrs, Map<String, String> configuration) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.enable_ha";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(heartbeatSrs), Marshalling.toXMLRPC(configuration)};
@@ -1349,9 +1346,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task disableHaAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.disable_ha";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1365,9 +1362,9 @@ public class Pool extends XenAPIObject {
*
*/
public static void disableHa(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.disable_ha";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1381,9 +1378,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task syncDatabaseAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.sync_database";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1397,9 +1394,9 @@ public class Pool extends XenAPIObject {
*
*/
public static void syncDatabase(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.sync_database";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1414,9 +1411,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task designateNewMasterAsync(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.designate_new_master";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host)};
@@ -1431,9 +1428,9 @@ public class Pool extends XenAPIObject {
* @param host The host who should become the new master
*/
public static void designateNewMaster(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.designate_new_master";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host)};
@@ -1447,9 +1444,9 @@ public class Pool extends XenAPIObject {
* @param seconds The number of seconds to block the restart thread for
*/
public static void haPreventRestartsFor(Connection c, Long seconds) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.ha_prevent_restarts_for";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(seconds)};
@@ -1464,15 +1461,15 @@ public class Pool extends XenAPIObject {
* @return true if a failover plan exists for the supplied number of host failures
*/
public static Boolean haFailoverPlanExists(Connection c, Long n) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.ha_failover_plan_exists";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(n)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -1481,15 +1478,15 @@ public class Pool extends XenAPIObject {
* @return maximum value for ha_host_failures_to_tolerate given current configuration
*/
public static Long haComputeMaxHostFailuresToTolerate(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.ha_compute_max_host_failures_to_tolerate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -1499,15 +1496,15 @@ public class Pool extends XenAPIObject {
* @return maximum value for ha_host_failures_to_tolerate given provided configuration
*/
public static Long haComputeHypotheticalMaxHostFailuresToTolerate(Connection c, Map<VM, String> configuration) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.ha_compute_hypothetical_max_host_failures_to_tolerate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(configuration)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -1518,15 +1515,15 @@ public class Pool extends XenAPIObject {
* @return VM failover plan: a map of VM to host to restart the host on
*/
public static Map<VM, Map<String, String>> haComputeVmFailoverPlan(Connection c, Set<Host> failedHosts, Set<VM> failedVms) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.ha_compute_vm_failover_plan";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(failedHosts), Marshalling.toXMLRPC(failedVms)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVMMapOfStringString(result);
+ return Types.toMapOfVMMapOfStringString(result);
}
/**
@@ -1536,9 +1533,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public Task setHaHostFailuresToTolerateAsync(Connection c, Long value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.set_ha_host_failures_to_tolerate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1553,9 +1550,9 @@ public class Pool extends XenAPIObject {
* @param value New number of host failures to consider
*/
public void setHaHostFailuresToTolerate(Connection c, Long value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_ha_host_failures_to_tolerate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1572,13 +1569,12 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public Task createNewBlobAsync(Connection c, String name, String mimeType, Boolean _public) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.create_new_blob";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType),
- Marshalling.toXMLRPC(_public)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType), Marshalling.toXMLRPC(_public)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1593,16 +1589,15 @@ public class Pool extends XenAPIObject {
* @return The reference of the blob, needed for populating its data
*/
public Blob createNewBlob(Connection c, String name, String mimeType, Boolean _public) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.create_new_blob";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType),
- Marshalling.toXMLRPC(_public)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType), Marshalling.toXMLRPC(_public)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBlob(result);
+ return Types.toBlob(result);
}
/**
@@ -1613,13 +1608,12 @@ public class Pool extends XenAPIObject {
* @param authType The type of authentication (e.g. AD for Active Directory)
*/
public void enableExternalAuth(Connection c, Map<String, String> config, String serviceName, String authType) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.enable_external_auth";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(config), Marshalling.toXMLRPC(serviceName),
- Marshalling.toXMLRPC(authType)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(config), Marshalling.toXMLRPC(serviceName), Marshalling.toXMLRPC(authType)};
Map response = c.dispatch(method_call, method_params);
return;
}
@@ -1630,9 +1624,9 @@ public class Pool extends XenAPIObject {
* @param config Optional parameters as a list of key-values containing the configuration data
*/
public void disableExternalAuth(Connection c, Map<String, String> config) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.disable_external_auth";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(config)};
@@ -1645,9 +1639,9 @@ public class Pool extends XenAPIObject {
*
*/
public void detectNonhomogeneousExternalAuth(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.detect_nonhomogeneous_external_auth";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1666,13 +1660,12 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task initializeWlbAsync(Connection c, String wlbUrl, String wlbUsername, String wlbPassword, String xenserverUsername, String xenserverPassword) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.initialize_wlb";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(wlbUrl), Marshalling.toXMLRPC(wlbUsername), Marshalling.toXMLRPC(wlbPassword),
- Marshalling.toXMLRPC(xenserverUsername), Marshalling.toXMLRPC(xenserverPassword)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(wlbUrl), Marshalling.toXMLRPC(wlbUsername), Marshalling.toXMLRPC(wlbPassword), Marshalling.toXMLRPC(xenserverUsername), Marshalling.toXMLRPC(xenserverPassword)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1688,13 +1681,12 @@ public class Pool extends XenAPIObject {
* @param xenserverPassword The password used by the wlb server to authenticate with the xenserver
*/
public static void initializeWlb(Connection c, String wlbUrl, String wlbUsername, String wlbPassword, String xenserverUsername, String xenserverPassword) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.initialize_wlb";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(wlbUrl), Marshalling.toXMLRPC(wlbUsername), Marshalling.toXMLRPC(wlbPassword),
- Marshalling.toXMLRPC(xenserverUsername), Marshalling.toXMLRPC(xenserverPassword)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(wlbUrl), Marshalling.toXMLRPC(wlbUsername), Marshalling.toXMLRPC(wlbPassword), Marshalling.toXMLRPC(xenserverUsername), Marshalling.toXMLRPC(xenserverPassword)};
Map response = c.dispatch(method_call, method_params);
return;
}
@@ -1705,9 +1697,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task deconfigureWlbAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.deconfigure_wlb";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1721,9 +1713,9 @@ public class Pool extends XenAPIObject {
*
*/
public static void deconfigureWlb(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.deconfigure_wlb";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1738,9 +1730,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task sendWlbConfigurationAsync(Connection c, Map<String, String> config) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.send_wlb_configuration";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(config)};
@@ -1755,9 +1747,9 @@ public class Pool extends XenAPIObject {
* @param config The configuration to use in optimizing this pool
*/
public static void sendWlbConfiguration(Connection c, Map<String, String> config) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.send_wlb_configuration";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(config)};
@@ -1771,9 +1763,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task retrieveWlbConfigurationAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.retrieve_wlb_configuration";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1788,15 +1780,15 @@ public class Pool extends XenAPIObject {
* @return The configuration used in optimizing this pool
*/
public static Map<String, String> retrieveWlbConfiguration(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.retrieve_wlb_configuration";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1805,9 +1797,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task retrieveWlbRecommendationsAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.retrieve_wlb_recommendations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1822,29 +1814,29 @@ public class Pool extends XenAPIObject {
* @return The list of vm migration recommendations
*/
public static Map<VM, Set<String>> retrieveWlbRecommendations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.retrieve_wlb_recommendations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVMSetOfString(result);
+ return Types.toMapOfVMSetOfString(result);
}
/**
* Send the given body to the given host and port, using HTTPS, and print the response. This is used for debugging the SSL layer.
*
- * @param host
- * @param port
- * @param body
+ * @param host
+ * @param port
+ * @param body
* @return Task
*/
public static Task sendTestPostAsync(Connection c, String host, Long port, String body) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.send_test_post";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(port), Marshalling.toXMLRPC(body)};
@@ -1856,21 +1848,21 @@ public class Pool extends XenAPIObject {
/**
* Send the given body to the given host and port, using HTTPS, and print the response. This is used for debugging the SSL layer.
*
- * @param host
- * @param port
- * @param body
+ * @param host
+ * @param port
+ * @param body
* @return The response
*/
public static String sendTestPost(Connection c, String host, Long port, String body) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.send_test_post";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(port), Marshalling.toXMLRPC(body)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1881,9 +1873,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task certificateInstallAsync(Connection c, String name, String cert) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.certificate_install";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(cert)};
@@ -1899,9 +1891,9 @@ public class Pool extends XenAPIObject {
* @param cert The certificate
*/
public static void certificateInstall(Connection c, String name, String cert) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.certificate_install";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(cert)};
@@ -1916,9 +1908,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task certificateUninstallAsync(Connection c, String name) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.certificate_uninstall";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(name)};
@@ -1933,9 +1925,9 @@ public class Pool extends XenAPIObject {
* @param name The certificate name
*/
public static void certificateUninstall(Connection c, String name) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.certificate_uninstall";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(name)};
@@ -1949,9 +1941,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task certificateListAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.certificate_list";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1966,15 +1958,15 @@ public class Pool extends XenAPIObject {
* @return All installed certificates
*/
public static Set<String> certificateList(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.certificate_list";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -1985,9 +1977,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task crlInstallAsync(Connection c, String name, String cert) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.crl_install";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(cert)};
@@ -2003,9 +1995,9 @@ public class Pool extends XenAPIObject {
* @param cert The CRL
*/
public static void crlInstall(Connection c, String name, String cert) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.crl_install";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(cert)};
@@ -2020,9 +2012,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task crlUninstallAsync(Connection c, String name) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.crl_uninstall";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(name)};
@@ -2037,9 +2029,9 @@ public class Pool extends XenAPIObject {
* @param name The CRL name
*/
public static void crlUninstall(Connection c, String name) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.crl_uninstall";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(name)};
@@ -2053,9 +2045,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task crlListAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.crl_list";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -2070,15 +2062,15 @@ public class Pool extends XenAPIObject {
* @return All installed CRLs
*/
public static Set<String> crlList(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.crl_list";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -2087,9 +2079,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task certificateSyncAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.certificate_sync";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -2103,9 +2095,9 @@ public class Pool extends XenAPIObject {
*
*/
public static void certificateSync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.certificate_sync";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -2120,9 +2112,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task enableRedoLogAsync(Connection c, SR sr) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.enable_redo_log";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(sr)};
@@ -2137,9 +2129,9 @@ public class Pool extends XenAPIObject {
* @param sr SR to hold the redo log.
*/
public static void enableRedoLog(Connection c, SR sr) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.enable_redo_log";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(sr)};
@@ -2153,9 +2145,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task disableRedoLogAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.disable_redo_log";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -2169,9 +2161,9 @@ public class Pool extends XenAPIObject {
*
*/
public static void disableRedoLog(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.disable_redo_log";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -2186,9 +2178,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public static Task setVswitchControllerAsync(Connection c, String address) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.set_vswitch_controller";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(address)};
@@ -2203,9 +2195,9 @@ public class Pool extends XenAPIObject {
* @param address IP address of the vswitch controller.
*/
public static void setVswitchController(Connection c, String address) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.set_vswitch_controller";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(address)};
@@ -2220,15 +2212,15 @@ public class Pool extends XenAPIObject {
* @return An XMLRPC result
*/
public String testArchiveTarget(Connection c, Map<String, String> config) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.test_archive_target";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(config)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -2237,9 +2229,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public Task enableLocalStorageCachingAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.enable_local_storage_caching";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2253,9 +2245,9 @@ public class Pool extends XenAPIObject {
*
*/
public void enableLocalStorageCaching(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.enable_local_storage_caching";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2269,9 +2261,9 @@ public class Pool extends XenAPIObject {
* @return Task
*/
public Task disableLocalStorageCachingAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool.disable_local_storage_caching";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2285,9 +2277,9 @@ public class Pool extends XenAPIObject {
*
*/
public void disableLocalStorageCaching(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.disable_local_storage_caching";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2296,20 +2288,88 @@ public class Pool extends XenAPIObject {
}
/**
+ * This call returns the license state for the pool
+ *
+ * @return Task
+ */
+ public Task getLicenseStateAsync(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "Async.pool.get_license_state";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
+ * This call returns the license state for the pool
+ *
+ * @return The pool's license state
+ */
+ public Map<String, String> getLicenseState(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "pool.get_license_state";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toMapOfStringString(result);
+ }
+
+ /**
+ * Apply an edition to all hosts in the pool
+ *
+ * @param edition The requested edition
+ * @return Task
+ */
+ public Task applyEditionAsync(Connection c, String edition) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "Async.pool.apply_edition";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(edition)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
+ * Apply an edition to all hosts in the pool
+ *
+ * @param edition The requested edition
+ */
+ public void applyEdition(Connection c, String edition) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "pool.apply_edition";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(edition)};
+ Map response = c.dispatch(method_call, method_params);
+ return;
+ }
+
+ /**
* Return a list of all the pools known to the system.
*
* @return references to all objects
*/
public static Set<Pool> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPool(result);
+ return Types.toSetOfPool(result);
}
/**
@@ -2318,15 +2378,15 @@ public class Pool extends XenAPIObject {
* @return records of all objects
*/
public static Map<Pool, Pool.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfPoolPoolRecord(result);
+ return Types.toMapOfPoolPoolRecord(result);
}
}
\ No newline at end of file
[38/50] [abbrv] - Updated APICommand annotation to add new flags that
indicate if API request or response carry sensitive info - Updated all API
classes with the new annotation flag values as per the API's sensitivity -
Updated server code to check respo
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
index 3d6d030..d2dccc1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmProfile;
import com.cloud.user.Account;
-@APICommand(name = "deleteAutoScaleVmProfile", description = "Deletes a autoscale vm profile.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteAutoScaleVmProfile", description = "Deletes a autoscale vm profile.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteAutoScaleVmProfileCmd.class.getName());
private static final String s_name = "deleteautoscalevmprofileresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
index 0cc2319..a029f15 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceInUseException;
import com.cloud.network.as.Condition;
import com.cloud.user.Account;
-@APICommand(name = "deleteCondition", description = "Removes a condition", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteCondition", description = "Removes a condition", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteConditionCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteConditionCmd.class.getName());
private static final String s_name = "deleteconditionresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
index 2bd6f87..dccb016 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.user.Account;
-@APICommand(name = "disableAutoScaleVmGroup", description = "Disables an AutoScale Vm Group", responseObject = AutoScaleVmGroupResponse.class)
+@APICommand(name = "disableAutoScaleVmGroup", description = "Disables an AutoScale Vm Group", responseObject = AutoScaleVmGroupResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DisableAutoScaleVmGroupCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DisableAutoScaleVmGroupCmd.class.getName());
private static final String s_name = "disableautoscalevmGroupresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
index dc89f2b..d9326d0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.user.Account;
-@APICommand(name = "enableAutoScaleVmGroup", description = "Enables an AutoScale Vm Group", responseObject = AutoScaleVmGroupResponse.class)
+@APICommand(name = "enableAutoScaleVmGroup", description = "Enables an AutoScale Vm Group", responseObject = AutoScaleVmGroupResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class EnableAutoScaleVmGroupCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(EnableAutoScaleVmGroupCmd.class.getName());
private static final String s_name = "enableautoscalevmGroupresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
index 84ed30a..615ed47 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.network.as.AutoScalePolicy;
-@APICommand(name = "listAutoScalePolicies", description = "Lists autoscale policies.", responseObject = AutoScalePolicyResponse.class)
+@APICommand(name = "listAutoScalePolicies", description = "Lists autoscale policies.", responseObject = AutoScalePolicyResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListAutoScalePoliciesCmd extends BaseListAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListAutoScalePoliciesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
index 4eda7a8..0d5de48 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
@@ -35,7 +35,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.as.AutoScaleVmGroup;
-@APICommand(name = "listAutoScaleVmGroups", description = "Lists autoscale vm groups.", responseObject = AutoScaleVmGroupResponse.class)
+@APICommand(name = "listAutoScaleVmGroups", description = "Lists autoscale vm groups.", responseObject = AutoScaleVmGroupResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListAutoScaleVmGroupsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListAutoScaleVmGroupsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
index 5b4a46e..5e73053 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
@@ -32,7 +32,8 @@ import org.apache.log4j.Logger;
import com.cloud.network.as.AutoScaleVmProfile;
-@APICommand(name = "listAutoScaleVmProfiles", description = "Lists autoscale vm profiles.", responseObject = AutoScaleVmProfileResponse.class)
+@APICommand(name = "listAutoScaleVmProfiles", description = "Lists autoscale vm profiles.", responseObject = AutoScaleVmProfileResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListAutoScaleVmProfilesCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListAutoScaleVmProfilesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
index 015f3ed..d75d649 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.network.as.Condition;
-@APICommand(name = "listConditions", description = "List Conditions for the specific user", responseObject = ConditionResponse.class)
+@APICommand(name = "listConditions", description = "List Conditions for the specific user", responseObject = ConditionResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListConditionsCmd extends BaseListAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListConditionsCmd.class.getName());
private static final String s_name = "listconditionsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
index f503b2b..6a9ac8d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.network.as.Counter;
import com.cloud.user.Account;
-@APICommand(name = "listCounters", description = "List the counters", responseObject = CounterResponse.class)
+@APICommand(name = "listCounters", description = "List the counters", responseObject = CounterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListCountersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListCountersCmd.class.getName());
private static final String s_name = "counterresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
index 91adeb1..d0be35d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
@@ -36,7 +36,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.user.Account;
-@APICommand(name = "updateAutoScalePolicy", description = "Updates an existing autoscale policy.", responseObject = AutoScalePolicyResponse.class)
+@APICommand(name = "updateAutoScalePolicy", description = "Updates an existing autoscale policy.", responseObject = AutoScalePolicyResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateAutoScalePolicyCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateAutoScalePolicyCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
index 0c8dc1c..c350b10 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
@@ -36,7 +36,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.user.Account;
-@APICommand(name = "updateAutoScaleVmGroup", description = "Updates an existing autoscale vm group.", responseObject = AutoScaleVmGroupResponse.class)
+@APICommand(name = "updateAutoScaleVmGroup", description = "Updates an existing autoscale vm group.", responseObject = AutoScaleVmGroupResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateAutoScaleVmGroupCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateAutoScaleVmGroupCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
index 20d4d0e..31f7329 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
@@ -37,7 +37,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmProfile;
import com.cloud.user.Account;
-@APICommand(name = "updateAutoScaleVmProfile", description = "Updates an existing autoscale vm profile.", responseObject = AutoScaleVmProfileResponse.class)
+@APICommand(name = "updateAutoScaleVmProfile", description = "Updates an existing autoscale vm profile.", responseObject = AutoScaleVmProfileResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateAutoScaleVmProfileCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateAutoScaleVmProfileCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
index 5c00814..d47645b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
@@ -26,7 +26,8 @@ import org.apache.cloudstack.api.response.CapabilitiesResponse;
import com.cloud.user.Account;
-@APICommand(name = "listCapabilities", description = "Lists capabilities", responseObject = CapabilitiesResponse.class)
+@APICommand(name = "listCapabilities", description = "Lists capabilities", responseObject = CapabilitiesResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListCapabilitiesCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ListCapabilitiesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
index e51f850..5b0b94a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
-@APICommand(name = "archiveEvents", description = "Archive one or more events.", responseObject = SuccessResponse.class)
+@APICommand(name = "archiveEvents", description = "Archive one or more events.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ArchiveEventsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ArchiveEventsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
index d00b58d..ccb6127 100644
--- a/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
-@APICommand(name = "deleteEvents", description = "Delete one or more events.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteEvents", description = "Delete one or more events.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteEventsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteEventsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
index 7a58d4c..91f316c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
@@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.user.Account;
-@APICommand(name = "listEventTypes", description = "List Event Types", responseObject = EventTypeResponse.class)
+@APICommand(name = "listEventTypes", description = "List Event Types", responseObject = EventTypeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListEventTypesCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ListEventTypesCmd.class.getName());
private static final String s_name = "listeventtypesresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
index 0e45e4e..b3525c3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
@@ -27,7 +27,8 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.EventResponse;
import org.apache.cloudstack.api.response.ListResponse;
-@APICommand(name = "listEvents", description = "A command to list events.", responseObject = EventResponse.class)
+@APICommand(name = "listEvents", description = "A command to list events.", responseObject = EventResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListEventsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListEventsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
index 22c8860..ca78755 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
@@ -43,7 +43,8 @@ import com.cloud.network.rules.FirewallRule;
import com.cloud.user.Account;
import com.cloud.utils.net.NetUtils;
-@APICommand(name = "createEgressFirewallRule", description = "Creates a egress firewall rule for a given network ", responseObject = FirewallResponse.class)
+@APICommand(name = "createEgressFirewallRule", description = "Creates a egress firewall rule for a given network ", responseObject = FirewallResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements FirewallRule {
public static final Logger s_logger = Logger.getLogger(CreateEgressFirewallRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
index 9ec2efd..0b342f2 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
@@ -42,7 +42,8 @@ import com.cloud.network.rules.FirewallRule;
import com.cloud.user.Account;
import com.cloud.utils.net.NetUtils;
-@APICommand(name = "createFirewallRule", description = "Creates a firewall rule for a given ip address", responseObject = FirewallResponse.class)
+@APICommand(name = "createFirewallRule", description = "Creates a firewall rule for a given ip address", responseObject = FirewallResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements FirewallRule {
public static final Logger s_logger = Logger.getLogger(CreateFirewallRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
index d441271..61d5856 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
@@ -44,7 +44,8 @@ import com.cloud.user.Account;
import com.cloud.utils.net.Ip;
import com.cloud.utils.net.NetUtils;
-@APICommand(name = "createPortForwardingRule", description = "Creates a port forwarding rule", responseObject = FirewallRuleResponse.class)
+@APICommand(name = "createPortForwardingRule", description = "Creates a port forwarding rule", responseObject = FirewallRuleResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements PortForwardingRule {
public static final Logger s_logger = Logger.getLogger(CreatePortForwardingRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
index 8e7b679..5ce2245 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.FirewallRule;
-@APICommand(name = "deleteEgressFirewallRule", description = "Deletes an ggress firewall rule", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteEgressFirewallRule", description = "Deletes an ggress firewall rule", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteEgressFirewallRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteEgressFirewallRuleCmd.class.getName());
private static final String s_name = "deleteegressfirewallruleresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
index c3029b8..7b10299 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.FirewallRule;
-@APICommand(name = "deleteFirewallRule", description = "Deletes a firewall rule", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteFirewallRule", description = "Deletes a firewall rule", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteFirewallRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteFirewallRuleCmd.class.getName());
private static final String s_name = "deletefirewallruleresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
index c493dd0..1e6e592 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
@@ -34,7 +34,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.PortForwardingRule;
-@APICommand(name = "deletePortForwardingRule", description = "Deletes a port forwarding rule", responseObject = SuccessResponse.class)
+@APICommand(name = "deletePortForwardingRule", description = "Deletes a port forwarding rule", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeletePortForwardingRuleCmd.class.getName());
private static final String s_name = "deleteportforwardingruleresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
index 4ac94df..6561462 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import com.cloud.network.rules.FirewallRule;
import com.cloud.utils.Pair;
-@APICommand(name = "listEgressFirewallRules", description = "Lists all egress firewall rules for network id.", responseObject = FirewallResponse.class)
+@APICommand(name = "listEgressFirewallRules", description = "Lists all egress firewall rules for network id.", responseObject = FirewallResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListEgressFirewallRulesCmd extends ListFirewallRulesCmd {
public static final Logger s_logger = Logger.getLogger(ListEgressFirewallRulesCmd.class.getName());
private static final String s_name = "listegressfirewallrulesresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
index 44d26e4..e0e1a40 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import com.cloud.network.rules.FirewallRule;
import com.cloud.utils.Pair;
-@APICommand(name = "listFirewallRules", description = "Lists all firewall rules for an IP address.", responseObject = FirewallResponse.class)
+@APICommand(name = "listFirewallRules", description = "Lists all firewall rules for an IP address.", responseObject = FirewallResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListFirewallRulesCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListFirewallRulesCmd.class.getName());
private static final String s_name = "listfirewallrulesresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
index bd8a7a1..1bb43ce 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import com.cloud.network.rules.PortForwardingRule;
import com.cloud.utils.Pair;
-@APICommand(name = "listPortForwardingRules", description = "Lists all port forwarding rules for an IP address.", responseObject = FirewallRuleResponse.class)
+@APICommand(name = "listPortForwardingRules", description = "Lists all port forwarding rules for an IP address.", responseObject = FirewallRuleResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListPortForwardingRulesCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListPortForwardingRulesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
index 43b9a61..0795396 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.FirewallRule.TrafficType;
-@APICommand(name = "updateEgressFirewallRule", description = "Updates egress firewall rule ", responseObject = FirewallResponse.class, since = "4.4")
+@APICommand(name = "updateEgressFirewallRule", description = "Updates egress firewall rule ", responseObject = FirewallResponse.class, since = "4.4",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateEgressFirewallRuleCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateEgressFirewallRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
index f6411d0..f684371 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.FirewallRule.TrafficType;
-@APICommand(name = "updateFirewallRule", description = "Updates firewall rule ", responseObject = FirewallResponse.class, since = "4.4")
+@APICommand(name = "updateFirewallRule", description = "Updates firewall rule ", responseObject = FirewallResponse.class, since = "4.4",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateFirewallRuleCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateFirewallRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
index f7ee86f..b47247d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
@@ -36,7 +36,8 @@ import com.cloud.user.Account;
@APICommand(name = "updatePortForwardingRule",
responseObject = FirewallRuleResponse.class,
- description = "Updates a port forwarding rule")
+ description = "Updates a port forwarding rule",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdatePortForwardingRuleCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdatePortForwardingRuleCmd.class.getName());
private static final String s_name = "updateportforwardingruleresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
index 604f1ed..e82e3c4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.storage.GuestOsCategory;
import com.cloud.utils.Pair;
-@APICommand(name = "listOsCategories", description = "Lists all supported OS categories for this cloud.", responseObject = GuestOSCategoryResponse.class)
+@APICommand(name = "listOsCategories", description = "Lists all supported OS categories for this cloud.", responseObject = GuestOSCategoryResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListGuestOsCategoriesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListIsosCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
index 287fb1e..15a625a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.storage.GuestOS;
import com.cloud.utils.Pair;
-@APICommand(name = "listOsTypes", description = "Lists all supported OS types for this cloud.", responseObject = GuestOSResponse.class)
+@APICommand(name = "listOsTypes", description = "Lists all supported OS types for this cloud.", responseObject = GuestOSResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListGuestOsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListIsosCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
index d38c816..c7bd5b1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.uservm.UserVm;
-@APICommand(name = "attachIso", description = "Attaches an ISO to a virtual machine.", responseObject = UserVmResponse.class)
+@APICommand(name = "attachIso", description = "Attaches an ISO to a virtual machine.", responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class AttachIsoCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AttachIsoCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
index 3619318..21196bc 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
@@ -22,7 +22,8 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
-@APICommand(name = "copyIso", description = "Copies an iso from one zone to another.", responseObject = TemplateResponse.class)
+@APICommand(name = "copyIso", description = "Copies an iso from one zone to another.", responseObject = TemplateResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CopyIsoCmd extends CopyTemplateCmd {
public static final Logger s_logger = Logger.getLogger(CopyIsoCmd.class.getName());
private static final String s_name = "copyisoresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
index 91ad5f1..b07b08d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
@@ -34,7 +34,8 @@ import com.cloud.event.EventTypes;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-@APICommand(name = "deleteIso", description = "Deletes an ISO file.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteIso", description = "Deletes an ISO file.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteIsoCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteIsoCmd.class.getName());
private static final String s_name = "deleteisosresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
index e40195b..d398009 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
@@ -31,7 +31,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.uservm.UserVm;
-@APICommand(name = "detachIso", description = "Detaches any ISO file (if any) currently attached to a virtual machine.", responseObject = UserVmResponse.class)
+@APICommand(name = "detachIso", description = "Detaches any ISO file (if any) currently attached to a virtual machine.", responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class DetachIsoCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DetachIsoCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
index 2fb215a..b78a3d3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.InternalErrorException;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-@APICommand(name = "extractIso", description = "Extracts an ISO", responseObject = ExtractResponse.class)
+@APICommand(name = "extractIso", description = "Extracts an ISO", responseObject = ExtractResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ExtractIsoCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ExtractIsoCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
index 9d9e44b..a54adfc 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
@@ -27,7 +27,9 @@ import com.cloud.template.VirtualMachineTemplate;
@APICommand(name = "listIsoPermissions",
description = "List iso visibility and all accounts that have permissions to view this iso.",
- responseObject = TemplatePermissionsResponse.class)
+ responseObject = TemplatePermissionsResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListIsoPermissionsCmd extends BaseListTemplateOrIsoPermissionsCmd {
protected String getResponseName() {
return "listisopermissionsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
index 95b771f..8c3e218 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
import com.cloud.user.Account;
-@APICommand(name = "listIsos", description = "Lists all available ISO files.", responseObject = TemplateResponse.class)
+@APICommand(name = "listIsos", description = "Lists all available ISO files.", responseObject = TemplateResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListIsosCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListIsosCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
index 29e3d67..af18057 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
@@ -37,7 +37,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.template.VirtualMachineTemplate;
-@APICommand(name = "registerIso", responseObject = TemplateResponse.class, description = "Registers an existing ISO into the CloudStack Cloud.")
+@APICommand(name = "registerIso", responseObject = TemplateResponse.class, description = "Registers an existing ISO into the CloudStack Cloud.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RegisterIsoCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(RegisterIsoCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
index 6a471c9..5f24e6a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
@@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-@APICommand(name = "updateIso", description = "Updates an ISO file.", responseObject = TemplateResponse.class)
+@APICommand(name = "updateIso", description = "Updates an ISO file.", responseObject = TemplateResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateIsoCmd extends BaseUpdateTemplateOrIsoCmd {
public static final Logger s_logger = Logger.getLogger(UpdateIsoCmd.class.getName());
private static final String s_name = "updateisoresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
index 8267b5c..b52bc91 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
@@ -25,7 +25,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-@APICommand(name = "updateIsoPermissions", description = "Updates iso permissions", responseObject = SuccessResponse.class)
+@APICommand(name = "updateIsoPermissions", description = "Updates iso permissions", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateIsoPermissionsCmd extends BaseUpdateTemplateOrIsoPermissionsCmd {
@Override
protected String getResponseName() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java b/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java
index 9d45d50..f7bfb94 100644
--- a/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java
@@ -25,7 +25,8 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AsyncJobResponse;
import org.apache.cloudstack.api.response.ListResponse;
-@APICommand(name = "listAsyncJobs", description = "Lists all pending asynchronous jobs for the account.", responseObject = AsyncJobResponse.class)
+@APICommand(name = "listAsyncJobs", description = "Lists all pending asynchronous jobs for the account.", responseObject = AsyncJobResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListAsyncJobsCmd extends BaseListAccountResourcesCmd {
private static final String s_name = "listasyncjobsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
index 1f9f5db..fc46300 100644
--- a/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
@@ -26,7 +26,8 @@ import org.apache.cloudstack.api.response.AsyncJobResponse;
import com.cloud.user.Account;
-@APICommand(name = "queryAsyncJobResult", description = "Retrieves the current status of asynchronous job.", responseObject = AsyncJobResponse.class)
+@APICommand(name = "queryAsyncJobResult", description = "Retrieves the current status of asynchronous job.", responseObject = AsyncJobResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class QueryAsyncJobResultCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(QueryAsyncJobResultCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
index 4b0ea54..ddafa72 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
@@ -38,7 +38,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
-@APICommand(name = "assignCertToLoadBalancer", description = "Assigns a certificate to a Load Balancer Rule", responseObject = SuccessResponse.class)
+@APICommand(name = "assignCertToLoadBalancer", description = "Assigns a certificate to a Load Balancer Rule", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AssignCertToLoadBalancerCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
index bcf6200..6bd7537 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
@@ -39,7 +39,9 @@ import com.cloud.utils.StringUtils;
@APICommand(name = "assignToLoadBalancerRule",
description = "Assigns virtual machine or a list of virtual machines to a load balancer rule.",
- responseObject = SuccessResponse.class)
+ responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AssignToLoadBalancerRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
index 94a1eaa..fa9c22e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
@@ -41,7 +41,8 @@ import com.cloud.network.Network;
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
import com.cloud.utils.net.NetUtils;
-@APICommand(name = "createLoadBalancer", description = "Creates a Load Balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0")
+@APICommand(name = "createLoadBalancer", description = "Creates a Load Balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateApplicationLoadBalancerCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
index 5ff7239..547274d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
@@ -39,7 +39,9 @@ import com.cloud.user.Account;
@APICommand(name = "createLBHealthCheckPolicy",
description = "Creates a Load Balancer healthcheck policy ",
responseObject = LBHealthCheckResponse.class,
- since = "4.2.0")
+ since = "4.2.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
@SuppressWarnings("rawtypes")
public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateLBHealthCheckPolicyCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
index 159fcf5..738f837 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
@@ -40,7 +40,8 @@ import com.cloud.network.rules.LoadBalancer;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.user.Account;
-@APICommand(name = "createLBStickinessPolicy", description = "Creates a Load Balancer stickiness policy ", responseObject = LBStickinessResponse.class, since = "3.0.0")
+@APICommand(name = "createLBStickinessPolicy", description = "Creates a Load Balancer stickiness policy ", responseObject = LBStickinessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@SuppressWarnings("rawtypes")
public class CreateLBStickinessPolicyCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateLBStickinessPolicyCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
index 71349af..a405913f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
@@ -49,7 +49,8 @@ import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
import com.cloud.utils.net.NetUtils;
-@APICommand(name = "createLoadBalancerRule", description = "Creates a load balancer rule", responseObject = LoadBalancerResponse.class)
+@APICommand(name = "createLoadBalancerRule", description = "Creates a load balancer rule", responseObject = LoadBalancerResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements LoadBalancer */{
public static final Logger s_logger = Logger.getLogger(CreateLoadBalancerRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
index 0b53d53..8f4ecca 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
-@APICommand(name = "deleteLoadBalancer", description = "Deletes a load balancer", responseObject = SuccessResponse.class, since = "4.2.0")
+@APICommand(name = "deleteLoadBalancer", description = "Deletes a load balancer", responseObject = SuccessResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteApplicationLoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteApplicationLoadBalancerCmd.class.getName());
private static final String s_name = "deleteloadbalancerresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
index d625ed5..3f27477 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
@@ -34,7 +34,8 @@ import com.cloud.network.rules.HealthCheckPolicy;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
-@APICommand(name = "deleteLBHealthCheckPolicy", description = "Deletes a load balancer HealthCheck policy.", responseObject = SuccessResponse.class, since = "4.2.0")
+@APICommand(name = "deleteLBHealthCheckPolicy", description = "Deletes a load balancer HealthCheck policy.", responseObject = SuccessResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteLBHealthCheckPolicyCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteLBHealthCheckPolicyCmd.class.getName());
private static final String s_name = "deletelbhealthcheckpolicyresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
index c4f72d9..ffed94b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
@@ -34,7 +34,8 @@ import com.cloud.network.rules.LoadBalancer;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.user.Account;
-@APICommand(name = "deleteLBStickinessPolicy", description = "Deletes a LB stickiness policy.", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "deleteLBStickinessPolicy", description = "Deletes a LB stickiness policy.", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteLBStickinessPolicyCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteLBStickinessPolicyCmd.class.getName());
private static final String s_name = "deleteLBstickinessrruleresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
index 1dc3cd1..3423cab 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
-@APICommand(name = "deleteLoadBalancerRule", description = "Deletes a load balancer rule.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteLoadBalancerRule", description = "Deletes a load balancer rule.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteLoadBalancerRuleCmd.class.getName());
private static final String s_name = "deleteloadbalancerruleresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
index d5683b0..fab1125 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.lb.CertService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteSslCert", description = "Delete a certificate to cloudstack", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteSslCert", description = "Delete a certificate to cloudstack", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSslCertCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteSslCertCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
index 05572c8..41b9817 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
import com.cloud.utils.Pair;
-@APICommand(name = "listLoadBalancers", description = "Lists Load Balancers", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0")
+@APICommand(name = "listLoadBalancers", description = "Lists Load Balancers", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListApplicationLoadBalancersCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
index 8aa286f..5f4ca09 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.network.rules.HealthCheckPolicy;
import com.cloud.network.rules.LoadBalancer;
-@APICommand(name = "listLBHealthCheckPolicies", description = "Lists load balancer HealthCheck policies.", responseObject = LBHealthCheckResponse.class, since = "4.2.0")
+@APICommand(name = "listLBHealthCheckPolicies", description = "Lists load balancer HealthCheck policies.", responseObject = LBHealthCheckResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListLBHealthCheckPoliciesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListLBHealthCheckPoliciesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
index ade4878..2e7ae3c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
@@ -34,7 +34,8 @@ import com.cloud.network.rules.LoadBalancer;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.user.Account;
-@APICommand(name = "listLBStickinessPolicies", description = "Lists LBStickiness policies.", responseObject = LBStickinessResponse.class, since = "3.0.0")
+@APICommand(name = "listLBStickinessPolicies", description = "Lists LBStickiness policies.", responseObject = LBStickinessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListLBStickinessPoliciesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListLBStickinessPoliciesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
index 2a39e1a..4412d51 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
@@ -34,7 +34,9 @@ import com.cloud.utils.Pair;
@APICommand(name = "listLoadBalancerRuleInstances",
description = "List all virtual machine instances that are assigned to a load balancer rule.",
- responseObject = UserVmResponse.class)
+ responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListLoadBalancerRuleInstancesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
index 663f991..013deb7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
@@ -36,7 +36,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.utils.Pair;
-@APICommand(name = "listLoadBalancerRules", description = "Lists load balancer rules.", responseObject = LoadBalancerResponse.class)
+@APICommand(name = "listLoadBalancerRules", description = "Lists load balancer rules.", responseObject = LoadBalancerResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListLoadBalancerRulesCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListLoadBalancerRulesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
index 7f8118a..aaadebb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
@@ -35,7 +35,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.network.lb.CertService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listSslCerts", description = "Lists SSL certificates", responseObject = SslCertResponse.class)
+@APICommand(name = "listSslCerts", description = "Lists SSL certificates", responseObject = SslCertResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSslCertsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteSslCertCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
index ea420f3..14da089 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
-@APICommand(name = "removeCertFromLoadBalancer", description = "Removes a certificate from a Load Balancer Rule", responseObject = SuccessResponse.class)
+@APICommand(name = "removeCertFromLoadBalancer", description = "Removes a certificate from a Load Balancer Rule", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RemoveCertFromLoadBalancerCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
index 5027ad3..8714d34 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
@@ -39,7 +39,9 @@ import com.cloud.utils.StringUtils;
@APICommand(name = "removeFromLoadBalancerRule",
description = "Removes a virtual machine or a list of virtual machines from a load balancer rule.",
- responseObject = SuccessResponse.class)
+ responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RemoveFromLoadBalancerRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
index e475416..fbda84d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
@@ -31,7 +31,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.FirewallRule;
-@APICommand(name = "updateLoadBalancer", description = "Updates a Load Balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.4.0")
+@APICommand(name = "updateLoadBalancer", description = "Updates a Load Balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.4.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateApplicationLoadBalancerCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
index 24f06e0..03dd621 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
@@ -35,7 +35,8 @@ import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
-@APICommand(name = "updateLoadBalancerRule", description = "Updates load balancer", responseObject = LoadBalancerResponse.class)
+@APICommand(name = "updateLoadBalancerRule", description = "Updates load balancer", responseObject = LoadBalancerResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateLoadBalancerRuleCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateLoadBalancerRuleCmd.class.getName());
private static final String s_name = "updateloadbalancerruleresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
index 00bd013..7b150a7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.lb.CertService;
-@APICommand(name = "uploadSslCert", description = "Upload a certificate to cloudstack", responseObject = SslCertResponse.class)
+@APICommand(name = "uploadSslCert", description = "Upload a certificate to cloudstack", responseObject = SslCertResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UploadSslCertCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UploadSslCertCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
index 320375c..70be167 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
@@ -41,7 +41,8 @@ import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.StaticNatRule;
import com.cloud.user.Account;
-@APICommand(name = "createIpForwardingRule", description = "Creates an ip forwarding rule", responseObject = FirewallRuleResponse.class)
+@APICommand(name = "createIpForwardingRule", description = "Creates an ip forwarding rule", responseObject = FirewallRuleResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements StaticNatRule {
public static final Logger s_logger = Logger.getLogger(CreateIpForwardingRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
index 66a9f8a..52a5ba7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
@@ -34,7 +34,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.FirewallRule;
-@APICommand(name = "deleteIpForwardingRule", description = "Deletes an ip forwarding rule", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteIpForwardingRule", description = "Deletes an ip forwarding rule", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteIpForwardingRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
index 351d3ae..1df77ec 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.IpAddress;
-@APICommand(name = "disableStaticNat", description = "Disables static rule for given ip address", responseObject = SuccessResponse.class)
+@APICommand(name = "disableStaticNat", description = "Disables static rule for given ip address", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DisableStaticNatCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeletePortForwardingRuleCmd.class.getName());
private static final String s_name = "disablestaticnatresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
index 832cbc2..aa4e287 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
@@ -36,7 +36,8 @@ import com.cloud.network.IpAddress;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "enableStaticNat", description = "Enables static nat for given ip address", responseObject = SuccessResponse.class)
+@APICommand(name = "enableStaticNat", description = "Enables static nat for given ip address", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class EnableStaticNatCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateIpForwardingRuleCmd.class.getName());
[18/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Console.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Console.java b/deps/XenServerJava/src/com/xensource/xenapi/Console.java
index ac2c9a7..bb4440ae 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Console.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Console.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Console extends XenAPIObject {
* For internal use only.
*/
Console(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Console extends XenAPIObject {
{
if (obj != null && obj instanceof Console)
{
- Console other = (Console)obj;
+ Console other = (Console) obj;
return other.ref.equals(this.ref);
} else
{
@@ -110,8 +111,8 @@ public class Console extends XenAPIObject {
/**
* Convert a console.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("protocol", this.protocol == null ? Types.ConsoleProtocol.UNRECOGNIZED : this.protocol);
map.put("location", this.location == null ? "" : this.location);
@@ -148,15 +149,15 @@ public class Console extends XenAPIObject {
* @return all fields from the object
*/
public Console.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toConsoleRecord(result);
+ return Types.toConsoleRecord(result);
}
/**
@@ -166,15 +167,15 @@ public class Console extends XenAPIObject {
* @return reference to the object
*/
public static Console getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toConsole(result);
+ return Types.toConsole(result);
}
/**
@@ -184,9 +185,9 @@ public class Console extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, Console.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.console.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -203,16 +204,16 @@ public class Console extends XenAPIObject {
* @return reference to the newly created object
*/
public static Console create(Connection c, Console.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toConsole(result);
+ return Types.toConsole(result);
}
/**
@@ -221,9 +222,9 @@ public class Console extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.console.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -237,9 +238,9 @@ public class Console extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -253,15 +254,15 @@ public class Console extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -270,15 +271,15 @@ public class Console extends XenAPIObject {
* @return value of the field
*/
public Types.ConsoleProtocol getProtocol(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.get_protocol";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toConsoleProtocol(result);
+ return Types.toConsoleProtocol(result);
}
/**
@@ -287,15 +288,15 @@ public class Console extends XenAPIObject {
* @return value of the field
*/
public String getLocation(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.get_location";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -304,15 +305,15 @@ public class Console extends XenAPIObject {
* @return value of the field
*/
public VM getVM(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.get_VM";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -321,15 +322,15 @@ public class Console extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -338,9 +339,9 @@ public class Console extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -355,9 +356,9 @@ public class Console extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -371,9 +372,9 @@ public class Console extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -387,15 +388,15 @@ public class Console extends XenAPIObject {
* @return references to all objects
*/
public static Set<Console> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfConsole(result);
+ return Types.toSetOfConsole(result);
}
/**
@@ -404,15 +405,15 @@ public class Console extends XenAPIObject {
* @return records of all objects
*/
public static Map<Console, Console.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "console.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfConsoleConsoleRecord(result);
+ return Types.toMapOfConsoleConsoleRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Crashdump.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Crashdump.java b/deps/XenServerJava/src/com/xensource/xenapi/Crashdump.java
index be11588..1d40d4d 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Crashdump.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Crashdump.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Crashdump extends XenAPIObject {
* For internal use only.
*/
Crashdump(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Crashdump extends XenAPIObject {
{
if (obj != null && obj instanceof Crashdump)
{
- Crashdump other = (Crashdump)obj;
+ Crashdump other = (Crashdump) obj;
return other.ref.equals(this.ref);
} else
{
@@ -109,8 +110,8 @@ public class Crashdump extends XenAPIObject {
/**
* Convert a crashdump.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("VM", this.VM == null ? new VM("OpaqueRef:NULL") : this.VM);
map.put("VDI", this.VDI == null ? new VDI("OpaqueRef:NULL") : this.VDI);
@@ -142,15 +143,15 @@ public class Crashdump extends XenAPIObject {
* @return all fields from the object
*/
public Crashdump.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toCrashdumpRecord(result);
+ return Types.toCrashdumpRecord(result);
}
/**
@@ -160,15 +161,15 @@ public class Crashdump extends XenAPIObject {
* @return reference to the object
*/
public static Crashdump getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toCrashdump(result);
+ return Types.toCrashdump(result);
}
/**
@@ -177,15 +178,15 @@ public class Crashdump extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -194,15 +195,15 @@ public class Crashdump extends XenAPIObject {
* @return value of the field
*/
public VM getVM(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.get_VM";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -211,15 +212,15 @@ public class Crashdump extends XenAPIObject {
* @return value of the field
*/
public VDI getVDI(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.get_VDI";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -228,15 +229,15 @@ public class Crashdump extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -245,9 +246,9 @@ public class Crashdump extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -262,9 +263,9 @@ public class Crashdump extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -278,9 +279,9 @@ public class Crashdump extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -294,9 +295,9 @@ public class Crashdump extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.crashdump.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -310,9 +311,9 @@ public class Crashdump extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -326,15 +327,15 @@ public class Crashdump extends XenAPIObject {
* @return references to all objects
*/
public static Set<Crashdump> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfCrashdump(result);
+ return Types.toSetOfCrashdump(result);
}
/**
@@ -343,15 +344,15 @@ public class Crashdump extends XenAPIObject {
* @return records of all objects
*/
public static Map<Crashdump, Crashdump.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "crashdump.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfCrashdumpCrashdumpRecord(result);
+ return Types.toMapOfCrashdumpCrashdumpRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/DRTask.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/DRTask.java b/deps/XenServerJava/src/com/xensource/xenapi/DRTask.java
index 14a5e40..bbca81c 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/DRTask.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/DRTask.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class DRTask extends XenAPIObject {
* For internal use only.
*/
DRTask(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class DRTask extends XenAPIObject {
{
if (obj != null && obj instanceof DRTask)
{
- DRTask other = (DRTask)obj;
+ DRTask other = (DRTask) obj;
return other.ref.equals(this.ref);
} else
{
@@ -107,8 +108,8 @@ public class DRTask extends XenAPIObject {
/**
* Convert a DR_task.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("introduced_SRs", this.introducedSRs == null ? new LinkedHashSet<SR>() : this.introducedSRs);
return map;
@@ -130,15 +131,15 @@ public class DRTask extends XenAPIObject {
* @return all fields from the object
*/
public DRTask.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "DR_task.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDRTaskRecord(result);
+ return Types.toDRTaskRecord(result);
}
/**
@@ -148,15 +149,15 @@ public class DRTask extends XenAPIObject {
* @return reference to the object
*/
public static DRTask getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "DR_task.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDRTask(result);
+ return Types.toDRTask(result);
}
/**
@@ -165,15 +166,15 @@ public class DRTask extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "DR_task.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -182,15 +183,15 @@ public class DRTask extends XenAPIObject {
* @return value of the field
*/
public Set<SR> getIntroducedSRs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "DR_task.get_introduced_SRs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfSR(result);
+ return Types.toSetOfSR(result);
}
/**
@@ -202,9 +203,9 @@ public class DRTask extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, String type, Map<String, String> deviceConfig, Set<String> whitelist) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.DR_task.create";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(whitelist)};
@@ -222,15 +223,15 @@ public class DRTask extends XenAPIObject {
* @return The reference to the created task
*/
public static DRTask create(Connection c, String type, Map<String, String> deviceConfig, Set<String> whitelist) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "DR_task.create";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(whitelist)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDRTask(result);
+ return Types.toDRTask(result);
}
/**
@@ -239,9 +240,9 @@ public class DRTask extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.DR_task.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -255,9 +256,9 @@ public class DRTask extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "DR_task.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -271,15 +272,15 @@ public class DRTask extends XenAPIObject {
* @return references to all objects
*/
public static Set<DRTask> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "DR_task.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfDRTask(result);
+ return Types.toSetOfDRTask(result);
}
/**
@@ -288,15 +289,15 @@ public class DRTask extends XenAPIObject {
* @return records of all objects
*/
public static Map<DRTask, DRTask.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "DR_task.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfDRTaskDRTaskRecord(result);
+ return Types.toMapOfDRTaskDRTaskRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/DataSource.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/DataSource.java b/deps/XenServerJava/src/com/xensource/xenapi/DataSource.java
index 5f777a3..9a4bfcd 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/DataSource.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/DataSource.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class DataSource extends XenAPIObject {
* For internal use only.
*/
DataSource(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class DataSource extends XenAPIObject {
{
if (obj != null && obj instanceof DataSource)
{
- DataSource other = (DataSource)obj;
+ DataSource other = (DataSource) obj;
return other.ref.equals(this.ref);
} else
{
@@ -113,8 +114,8 @@ public class DataSource extends XenAPIObject {
/**
* Convert a data_source.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
map.put("enabled", this.enabled == null ? false : this.enabled);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Event.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Event.java b/deps/XenServerJava/src/com/xensource/xenapi/Event.java
index ec43814..3014ba0 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Event.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Event.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Event extends XenAPIObject {
* For internal use only.
*/
Event(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Event extends XenAPIObject {
{
if (obj != null && obj instanceof Event)
{
- Event other = (Event)obj;
+ Event other = (Event) obj;
return other.ref.equals(this.ref);
} else
{
@@ -112,8 +113,8 @@ public class Event extends XenAPIObject {
/**
* Convert a event.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("id", this.id == null ? 0 : this.id);
map.put("timestamp", this.timestamp == null ? new Date(0) : this.timestamp);
map.put("class", this.clazz == null ? "" : this.clazz);
@@ -162,9 +163,9 @@ public class Event extends XenAPIObject {
* @return Task
*/
public static Task registerAsync(Connection c, Set<String> classes) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.event.register";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(classes)};
@@ -179,9 +180,9 @@ public class Event extends XenAPIObject {
* @param classes register for events for the indicated classes
*/
public static void register(Connection c, Set<String> classes) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "event.register";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(classes)};
@@ -196,9 +197,9 @@ public class Event extends XenAPIObject {
* @return Task
*/
public static Task unregisterAsync(Connection c, Set<String> classes) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.event.unregister";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(classes)};
@@ -213,9 +214,9 @@ public class Event extends XenAPIObject {
* @param classes remove this session's registration for the indicated classes
*/
public static void unregister(Connection c, Set<String> classes) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "event.unregister";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(classes)};
@@ -229,17 +230,17 @@ public class Event extends XenAPIObject {
* @return the batch of events
*/
public static Set<Event.Record> next(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SessionNotRegistered,
- Types.EventsLost {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SessionNotRegistered,
+ Types.EventsLost {
String method_call = "event.next";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfEventRecord(result);
+ return Types.toSetOfEventRecord(result);
}
/**
@@ -251,17 +252,17 @@ public class Event extends XenAPIObject {
* @return the batch of events
*/
public static Set<Event.Record> from(Connection c, Set<String> classes, String token, Double timeout) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SessionNotRegistered,
- Types.EventsLost {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SessionNotRegistered,
+ Types.EventsLost {
String method_call = "event.from";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(classes), Marshalling.toXMLRPC(token), Marshalling.toXMLRPC(timeout)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfEventRecord(result);
+ return Types.toSetOfEventRecord(result);
}
/**
@@ -270,15 +271,15 @@ public class Event extends XenAPIObject {
* @return the event ID
*/
public static Long getCurrentId(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "event.get_current_id";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -289,30 +290,15 @@ public class Event extends XenAPIObject {
* @return the event ID
*/
public static String inject(Connection c, String clazz, String ref) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "event.inject";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(clazz), Marshalling.toXMLRPC(ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
- }
-
- public static Map properFrom(Connection c, Set<String> classes, String token, Double timeout) throws BadServerResponse, XenAPIException, XmlRpcException,
- Types.SessionNotRegistered,
- Types.EventsLost {
- String method_call = "event.from";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(classes), Marshalling.toXMLRPC(token), Marshalling.toXMLRPC(timeout)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- Map value = (Map)result;
- Map<String, Object> from = new HashMap<String, Object>();
- from.put("token", value.get("token"));
- from.put("events", Types.toSetOfEventRecord(value.get("events")));
- return from;
+ return Types.toString(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/GPUGroup.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/GPUGroup.java b/deps/XenServerJava/src/com/xensource/xenapi/GPUGroup.java
index 9070446..916d8b6 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/GPUGroup.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/GPUGroup.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class GPUGroup extends XenAPIObject {
* For internal use only.
*/
GPUGroup(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class GPUGroup extends XenAPIObject {
{
if (obj != null && obj instanceof GPUGroup)
{
- GPUGroup other = (GPUGroup)obj;
+ GPUGroup other = (GPUGroup) obj;
return other.ref.equals(this.ref);
} else
{
@@ -106,14 +107,17 @@ public class GPUGroup extends XenAPIObject {
print.printf("%1$20s: %2$s\n", "VGPUs", this.VGPUs);
print.printf("%1$20s: %2$s\n", "GPUTypes", this.GPUTypes);
print.printf("%1$20s: %2$s\n", "otherConfig", this.otherConfig);
+ print.printf("%1$20s: %2$s\n", "allocationAlgorithm", this.allocationAlgorithm);
+ print.printf("%1$20s: %2$s\n", "supportedVGPUTypes", this.supportedVGPUTypes);
+ print.printf("%1$20s: %2$s\n", "enabledVGPUTypes", this.enabledVGPUTypes);
return writer.toString();
}
/**
* Convert a GPU_group.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -121,6 +125,9 @@ public class GPUGroup extends XenAPIObject {
map.put("VGPUs", this.VGPUs == null ? new LinkedHashSet<VGPU>() : this.VGPUs);
map.put("GPU_types", this.GPUTypes == null ? new LinkedHashSet<String>() : this.GPUTypes);
map.put("other_config", this.otherConfig == null ? new HashMap<String, String>() : this.otherConfig);
+ map.put("allocation_algorithm", this.allocationAlgorithm == null ? Types.AllocationAlgorithm.UNRECOGNIZED : this.allocationAlgorithm);
+ map.put("supported_VGPU_types", this.supportedVGPUTypes == null ? new LinkedHashSet<VGPUType>() : this.supportedVGPUTypes);
+ map.put("enabled_VGPU_types", this.enabledVGPUTypes == null ? new LinkedHashSet<VGPUType>() : this.enabledVGPUTypes);
return map;
}
@@ -152,6 +159,18 @@ public class GPUGroup extends XenAPIObject {
* Additional configuration
*/
public Map<String, String> otherConfig;
+ /**
+ * Current allocation of vGPUs to pGPUs for this group
+ */
+ public Types.AllocationAlgorithm allocationAlgorithm;
+ /**
+ * vGPU types supported on at least one of the pGPUs in this group
+ */
+ public Set<VGPUType> supportedVGPUTypes;
+ /**
+ * vGPU types supported on at least one of the pGPUs in this group
+ */
+ public Set<VGPUType> enabledVGPUTypes;
}
/**
@@ -160,15 +179,15 @@ public class GPUGroup extends XenAPIObject {
* @return all fields from the object
*/
public GPUGroup.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toGPUGroupRecord(result);
+ return Types.toGPUGroupRecord(result);
}
/**
@@ -178,15 +197,15 @@ public class GPUGroup extends XenAPIObject {
* @return reference to the object
*/
public static GPUGroup getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toGPUGroup(result);
+ return Types.toGPUGroup(result);
}
/**
@@ -196,15 +215,15 @@ public class GPUGroup extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<GPUGroup> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfGPUGroup(result);
+ return Types.toSetOfGPUGroup(result);
}
/**
@@ -213,15 +232,15 @@ public class GPUGroup extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -230,15 +249,15 @@ public class GPUGroup extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -247,15 +266,15 @@ public class GPUGroup extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -264,15 +283,15 @@ public class GPUGroup extends XenAPIObject {
* @return value of the field
*/
public Set<PGPU> getPGPUs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_PGPUs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPGPU(result);
+ return Types.toSetOfPGPU(result);
}
/**
@@ -281,15 +300,15 @@ public class GPUGroup extends XenAPIObject {
* @return value of the field
*/
public Set<VGPU> getVGPUs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_VGPUs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVGPU(result);
+ return Types.toSetOfVGPU(result);
}
/**
@@ -298,15 +317,15 @@ public class GPUGroup extends XenAPIObject {
* @return value of the field
*/
public Set<String> getGPUTypes(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_GPU_types";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -315,15 +334,66 @@ public class GPUGroup extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
+ }
+
+ /**
+ * Get the allocation_algorithm field of the given GPU_group.
+ *
+ * @return value of the field
+ */
+ public Types.AllocationAlgorithm getAllocationAlgorithm(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "GPU_group.get_allocation_algorithm";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toAllocationAlgorithm(result);
+ }
+
+ /**
+ * Get the supported_VGPU_types field of the given GPU_group.
+ *
+ * @return value of the field
+ */
+ public Set<VGPUType> getSupportedVGPUTypes(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "GPU_group.get_supported_VGPU_types";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfVGPUType(result);
+ }
+
+ /**
+ * Get the enabled_VGPU_types field of the given GPU_group.
+ *
+ * @return value of the field
+ */
+ public Set<VGPUType> getEnabledVGPUTypes(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "GPU_group.get_enabled_VGPU_types";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfVGPUType(result);
}
/**
@@ -332,9 +402,9 @@ public class GPUGroup extends XenAPIObject {
* @param label New value to set
*/
public void setNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(label)};
@@ -348,9 +418,9 @@ public class GPUGroup extends XenAPIObject {
* @param description New value to set
*/
public void setNameDescription(Connection c, String description) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(description)};
@@ -364,9 +434,9 @@ public class GPUGroup extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -381,9 +451,9 @@ public class GPUGroup extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -397,9 +467,9 @@ public class GPUGroup extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -408,20 +478,144 @@ public class GPUGroup extends XenAPIObject {
}
/**
+ * Set the allocation_algorithm field of the given GPU_group.
+ *
+ * @param allocationAlgorithm New value to set
+ */
+ public void setAllocationAlgorithm(Connection c, Types.AllocationAlgorithm allocationAlgorithm) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "GPU_group.set_allocation_algorithm";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(allocationAlgorithm)};
+ Map response = c.dispatch(method_call, method_params);
+ return;
+ }
+
+ /**
+ *
+ *
+ * @param nameLabel
+ * @param nameDescription
+ * @param otherConfig
+ * @return Task
+ */
+ public static Task createAsync(Connection c, String nameLabel, String nameDescription, Map<String, String> otherConfig) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "Async.GPU_group.create";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(otherConfig)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
+ *
+ *
+ * @param nameLabel
+ * @param nameDescription
+ * @param otherConfig
+ * @return
+ */
+ public static GPUGroup create(Connection c, String nameLabel, String nameDescription, Map<String, String> otherConfig) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "GPU_group.create";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(otherConfig)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toGPUGroup(result);
+ }
+
+ /**
+ *
+ *
+ * @return Task
+ */
+ public Task destroyAsync(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "Async.GPU_group.destroy";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
+ *
+ *
+ */
+ public void destroy(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "GPU_group.destroy";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ return;
+ }
+
+ /**
+ *
+ *
+ * @param vgpuType The VGPU_type for which the remaining capacity will be calculated
+ * @return Task
+ */
+ public Task getRemainingCapacityAsync(Connection c, VGPUType vgpuType) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "Async.GPU_group.get_remaining_capacity";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(vgpuType)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
+ *
+ *
+ * @param vgpuType The VGPU_type for which the remaining capacity will be calculated
+ * @return The number of VGPUs of the given type which can still be started on the PGPUs in the group
+ */
+ public Long getRemainingCapacity(Connection c, VGPUType vgpuType) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "GPU_group.get_remaining_capacity";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(vgpuType)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toLong(result);
+ }
+
+ /**
* Return a list of all the GPU_groups known to the system.
*
* @return references to all objects
*/
public static Set<GPUGroup> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfGPUGroup(result);
+ return Types.toSetOfGPUGroup(result);
}
/**
@@ -430,15 +624,15 @@ public class GPUGroup extends XenAPIObject {
* @return records of all objects
*/
public static Map<GPUGroup, GPUGroup.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "GPU_group.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfGPUGroupGPUGroupRecord(result);
+ return Types.toMapOfGPUGroupGPUGroupRecord(result);
}
}
\ No newline at end of file
[10/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Session.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Session.java b/deps/XenServerJava/src/com/xensource/xenapi/Session.java
index bdf3b4c..a00ab7d 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Session.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Session.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Session extends XenAPIObject {
* For internal use only.
*/
Session(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Session extends XenAPIObject {
{
if (obj != null && obj instanceof Session)
{
- Session other = (Session)obj;
+ Session other = (Session) obj;
return other.ref.equals(this.ref);
} else
{
@@ -119,8 +120,8 @@ public class Session extends XenAPIObject {
/**
* Convert a session.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("this_host", this.thisHost == null ? new Host("OpaqueRef:NULL") : this.thisHost);
map.put("this_user", this.thisUser == null ? new User("OpaqueRef:NULL") : this.thisUser);
@@ -202,15 +203,15 @@ public class Session extends XenAPIObject {
* @return all fields from the object
*/
public Session.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSessionRecord(result);
+ return Types.toSessionRecord(result);
}
/**
@@ -220,15 +221,15 @@ public class Session extends XenAPIObject {
* @return reference to the object
*/
public static Session getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSession(result);
+ return Types.toSession(result);
}
/**
@@ -237,15 +238,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -254,15 +255,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public Host getThisHost(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_this_host";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -271,15 +272,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public User getThisUser(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_this_user";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toUser(result);
+ return Types.toUser(result);
}
/**
@@ -288,15 +289,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public Date getLastActive(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_last_active";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -305,15 +306,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public Boolean getPool(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_pool";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -322,15 +323,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -339,15 +340,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public Boolean getIsLocalSuperuser(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_is_local_superuser";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -356,15 +357,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public Subject getSubject(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_subject";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSubject(result);
+ return Types.toSubject(result);
}
/**
@@ -373,15 +374,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public Date getValidationTime(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_validation_time";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -390,15 +391,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public String getAuthUserSid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_auth_user_sid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -407,15 +408,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public String getAuthUserName(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_auth_user_name";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -424,15 +425,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public Set<String> getRbacPermissions(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_rbac_permissions";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -441,15 +442,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public Set<Task> getTasks(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_tasks";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfTask(result);
+ return Types.toSetOfTask(result);
}
/**
@@ -458,15 +459,15 @@ public class Session extends XenAPIObject {
* @return value of the field
*/
public Session getParent(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_parent";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSession(result);
+ return Types.toSession(result);
}
/**
@@ -475,9 +476,9 @@ public class Session extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -492,9 +493,9 @@ public class Session extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -508,9 +509,9 @@ public class Session extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -527,15 +528,15 @@ public class Session extends XenAPIObject {
* @return reference of newly created session
*/
public static Session loginWithPassword(Connection c, String uname, String pwd, String version) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SessionAuthenticationFailed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SessionAuthenticationFailed {
String method_call = "session.login_with_password";
Object[] method_params = {Marshalling.toXMLRPC(uname), Marshalling.toXMLRPC(pwd), Marshalling.toXMLRPC(version)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSession(result);
+ return Types.toSession(result);
}
/**
@@ -543,9 +544,9 @@ public class Session extends XenAPIObject {
*
*/
public static void logout(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.logout";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -560,9 +561,9 @@ public class Session extends XenAPIObject {
* @param newPwd New password for account
*/
public static void changePassword(Connection c, String oldPwd, String newPwd) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.change_password";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(oldPwd), Marshalling.toXMLRPC(newPwd)};
@@ -578,14 +579,14 @@ public class Session extends XenAPIObject {
* @return ID of newly created session
*/
public static Session slaveLocalLoginWithPassword(Connection c, String uname, String pwd) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.slave_local_login_with_password";
Object[] method_params = {Marshalling.toXMLRPC(uname), Marshalling.toXMLRPC(pwd)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSession(result);
+ return Types.toSession(result);
}
/**
@@ -593,9 +594,9 @@ public class Session extends XenAPIObject {
*
*/
public static void localLogout(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.local_logout";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -609,9 +610,9 @@ public class Session extends XenAPIObject {
* @return Task
*/
public static Task getAllSubjectIdentifiersAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.session.get_all_subject_identifiers";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -626,15 +627,15 @@ public class Session extends XenAPIObject {
* @return The list of user subject-identifiers of all existing sessions
*/
public static Set<String> getAllSubjectIdentifiers(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.get_all_subject_identifiers";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -644,9 +645,9 @@ public class Session extends XenAPIObject {
* @return Task
*/
public static Task logoutSubjectIdentifierAsync(Connection c, String subjectIdentifier) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.session.logout_subject_identifier";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(subjectIdentifier)};
@@ -661,9 +662,9 @@ public class Session extends XenAPIObject {
* @param subjectIdentifier User subject-identifier of the sessions to be destroyed
*/
public static void logoutSubjectIdentifier(Connection c, String subjectIdentifier) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "session.logout_subject_identifier";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(subjectIdentifier)};
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Subject.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Subject.java b/deps/XenServerJava/src/com/xensource/xenapi/Subject.java
index a599f237..9a8fbfb 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Subject.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Subject.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Subject extends XenAPIObject {
* For internal use only.
*/
Subject(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Subject extends XenAPIObject {
{
if (obj != null && obj instanceof Subject)
{
- Subject other = (Subject)obj;
+ Subject other = (Subject) obj;
return other.ref.equals(this.ref);
} else
{
@@ -109,8 +110,8 @@ public class Subject extends XenAPIObject {
/**
* Convert a subject.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("subject_identifier", this.subjectIdentifier == null ? "" : this.subjectIdentifier);
map.put("other_config", this.otherConfig == null ? new HashMap<String, String>() : this.otherConfig);
@@ -142,15 +143,15 @@ public class Subject extends XenAPIObject {
* @return all fields from the object
*/
public Subject.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSubjectRecord(result);
+ return Types.toSubjectRecord(result);
}
/**
@@ -160,15 +161,15 @@ public class Subject extends XenAPIObject {
* @return reference to the object
*/
public static Subject getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSubject(result);
+ return Types.toSubject(result);
}
/**
@@ -178,9 +179,9 @@ public class Subject extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, Subject.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.subject.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -197,16 +198,16 @@ public class Subject extends XenAPIObject {
* @return reference to the newly created object
*/
public static Subject create(Connection c, Subject.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSubject(result);
+ return Types.toSubject(result);
}
/**
@@ -215,9 +216,9 @@ public class Subject extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.subject.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -231,9 +232,9 @@ public class Subject extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -247,15 +248,15 @@ public class Subject extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -264,15 +265,15 @@ public class Subject extends XenAPIObject {
* @return value of the field
*/
public String getSubjectIdentifier(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.get_subject_identifier";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -281,15 +282,15 @@ public class Subject extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -298,15 +299,15 @@ public class Subject extends XenAPIObject {
* @return value of the field
*/
public Set<Role> getRoles(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.get_roles";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfRole(result);
+ return Types.toSetOfRole(result);
}
/**
@@ -315,9 +316,9 @@ public class Subject extends XenAPIObject {
* @param role The unique role reference
*/
public void addToRoles(Connection c, Role role) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.add_to_roles";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(role)};
@@ -331,9 +332,9 @@ public class Subject extends XenAPIObject {
* @param role The unique role reference in the subject's roles field
*/
public void removeFromRoles(Connection c, Role role) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.remove_from_roles";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(role)};
@@ -347,15 +348,15 @@ public class Subject extends XenAPIObject {
* @return a list of permission names
*/
public Set<String> getPermissionsNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.get_permissions_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -364,15 +365,15 @@ public class Subject extends XenAPIObject {
* @return references to all objects
*/
public static Set<Subject> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfSubject(result);
+ return Types.toSetOfSubject(result);
}
/**
@@ -381,15 +382,15 @@ public class Subject extends XenAPIObject {
* @return records of all objects
*/
public static Map<Subject, Subject.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "subject.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfSubjectSubjectRecord(result);
+ return Types.toMapOfSubjectSubjectRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Task.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Task.java b/deps/XenServerJava/src/com/xensource/xenapi/Task.java
index 59d59f6..4a85dfe 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Task.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Task.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Task extends XenAPIObject {
* For internal use only.
*/
Task(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Task extends XenAPIObject {
{
if (obj != null && obj instanceof Task)
{
- Task other = (Task)obj;
+ Task other = (Task) obj;
return other.ref.equals(this.ref);
} else
{
@@ -121,8 +122,8 @@ public class Task extends XenAPIObject {
/**
* Convert a task.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -214,15 +215,15 @@ public class Task extends XenAPIObject {
* @return all fields from the object
*/
public Task.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toTaskRecord(result);
+ return Types.toTaskRecord(result);
}
/**
@@ -232,15 +233,15 @@ public class Task extends XenAPIObject {
* @return reference to the object
*/
public static Task getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toTask(result);
+ return Types.toTask(result);
}
/**
@@ -250,15 +251,15 @@ public class Task extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<Task> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfTask(result);
+ return Types.toSetOfTask(result);
}
/**
@@ -267,15 +268,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -284,15 +285,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -301,15 +302,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -318,15 +319,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Set<Types.TaskAllowedOperations> getAllowedOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_allowed_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfTaskAllowedOperations(result);
+ return Types.toSetOfTaskAllowedOperations(result);
}
/**
@@ -335,15 +336,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Map<String, Types.TaskAllowedOperations> getCurrentOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_current_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringTaskAllowedOperations(result);
+ return Types.toMapOfStringTaskAllowedOperations(result);
}
/**
@@ -352,15 +353,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Date getCreated(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_created";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -369,15 +370,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Date getFinished(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_finished";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -386,15 +387,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Types.TaskStatusType getStatus(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_status";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toTaskStatusType(result);
+ return Types.toTaskStatusType(result);
}
/**
@@ -403,15 +404,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Host getResidentOn(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_resident_on";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -420,15 +421,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Double getProgress(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_progress";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDouble(result);
+ return Types.toDouble(result);
}
/**
@@ -437,15 +438,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public String getType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -454,15 +455,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public String getResult(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_result";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -471,15 +472,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Set<String> getErrorInfo(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_error_info";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -488,15 +489,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -505,15 +506,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Task getSubtaskOf(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_subtask_of";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toTask(result);
+ return Types.toTask(result);
}
/**
@@ -522,15 +523,15 @@ public class Task extends XenAPIObject {
* @return value of the field
*/
public Set<Task> getSubtasks(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_subtasks";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfTask(result);
+ return Types.toSetOfTask(result);
}
/**
@@ -539,9 +540,9 @@ public class Task extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -556,9 +557,9 @@ public class Task extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -572,9 +573,9 @@ public class Task extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -590,15 +591,15 @@ public class Task extends XenAPIObject {
* @return The reference of the created task object
*/
public static Task create(Connection c, String label, String description) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.create";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label), Marshalling.toXMLRPC(description)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toTask(result);
+ return Types.toTask(result);
}
/**
@@ -606,9 +607,9 @@ public class Task extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -622,10 +623,10 @@ public class Task extends XenAPIObject {
* @return Task
*/
public Task cancelAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OperationNotAllowed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OperationNotAllowed {
String method_call = "Async.task.cancel";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -639,10 +640,10 @@ public class Task extends XenAPIObject {
*
*/
public void cancel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OperationNotAllowed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OperationNotAllowed {
String method_call = "task.cancel";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -656,15 +657,15 @@ public class Task extends XenAPIObject {
* @return references to all objects
*/
public static Set<Task> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfTask(result);
+ return Types.toSetOfTask(result);
}
/**
@@ -673,15 +674,15 @@ public class Task extends XenAPIObject {
* @return records of all objects
*/
public static Map<Task, Task.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "task.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfTaskTaskRecord(result);
+ return Types.toMapOfTaskTaskRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Tunnel.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Tunnel.java b/deps/XenServerJava/src/com/xensource/xenapi/Tunnel.java
index 44b236d..e30bd0a 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Tunnel.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Tunnel.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Tunnel extends XenAPIObject {
* For internal use only.
*/
Tunnel(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Tunnel extends XenAPIObject {
{
if (obj != null && obj instanceof Tunnel)
{
- Tunnel other = (Tunnel)obj;
+ Tunnel other = (Tunnel) obj;
return other.ref.equals(this.ref);
} else
{
@@ -110,8 +111,8 @@ public class Tunnel extends XenAPIObject {
/**
* Convert a tunnel.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("access_PIF", this.accessPIF == null ? new PIF("OpaqueRef:NULL") : this.accessPIF);
map.put("transport_PIF", this.transportPIF == null ? new PIF("OpaqueRef:NULL") : this.transportPIF);
@@ -148,15 +149,15 @@ public class Tunnel extends XenAPIObject {
* @return all fields from the object
*/
public Tunnel.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toTunnelRecord(result);
+ return Types.toTunnelRecord(result);
}
/**
@@ -166,15 +167,15 @@ public class Tunnel extends XenAPIObject {
* @return reference to the object
*/
public static Tunnel getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toTunnel(result);
+ return Types.toTunnel(result);
}
/**
@@ -183,15 +184,15 @@ public class Tunnel extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -200,15 +201,15 @@ public class Tunnel extends XenAPIObject {
* @return value of the field
*/
public PIF getAccessPIF(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.get_access_PIF";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
@@ -217,15 +218,15 @@ public class Tunnel extends XenAPIObject {
* @return value of the field
*/
public PIF getTransportPIF(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.get_transport_PIF";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
@@ -234,15 +235,15 @@ public class Tunnel extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getStatus(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.get_status";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -251,15 +252,15 @@ public class Tunnel extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -268,9 +269,9 @@ public class Tunnel extends XenAPIObject {
* @param status New value to set
*/
public void setStatus(Connection c, Map<String, String> status) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.set_status";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(status)};
@@ -285,9 +286,9 @@ public class Tunnel extends XenAPIObject {
* @param value Value to add
*/
public void addToStatus(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.add_to_status";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -301,9 +302,9 @@ public class Tunnel extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromStatus(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.remove_from_status";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -317,9 +318,9 @@ public class Tunnel extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -334,9 +335,9 @@ public class Tunnel extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -350,9 +351,9 @@ public class Tunnel extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -368,12 +369,12 @@ public class Tunnel extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, PIF transportPIF, Network network) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OpenvswitchNotActive,
- Types.TransportPifNotConfigured,
- Types.IsTunnelAccessPif {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OpenvswitchNotActive,
+ Types.TransportPifNotConfigured,
+ Types.IsTunnelAccessPif {
String method_call = "Async.tunnel.create";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(transportPIF), Marshalling.toXMLRPC(network)};
@@ -390,18 +391,18 @@ public class Tunnel extends XenAPIObject {
* @return The reference of the created tunnel object
*/
public static Tunnel create(Connection c, PIF transportPIF, Network network) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OpenvswitchNotActive,
- Types.TransportPifNotConfigured,
- Types.IsTunnelAccessPif {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OpenvswitchNotActive,
+ Types.TransportPifNotConfigured,
+ Types.IsTunnelAccessPif {
String method_call = "tunnel.create";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(transportPIF), Marshalling.toXMLRPC(network)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toTunnel(result);
+ return Types.toTunnel(result);
}
/**
@@ -410,9 +411,9 @@ public class Tunnel extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.tunnel.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -426,9 +427,9 @@ public class Tunnel extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -442,15 +443,15 @@ public class Tunnel extends XenAPIObject {
* @return references to all objects
*/
public static Set<Tunnel> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfTunnel(result);
+ return Types.toSetOfTunnel(result);
}
/**
@@ -459,15 +460,15 @@ public class Tunnel extends XenAPIObject {
* @return records of all objects
*/
public static Map<Tunnel, Tunnel.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "tunnel.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfTunnelTunnelRecord(result);
+ return Types.toMapOfTunnelTunnelRecord(result);
}
}
\ No newline at end of file
[32/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
replace String != operation with .equals
replaced the != operation performed on two String objects with ObjectUtils.equals
Signed-off-by: Laszlo Hornyak <la...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e3fde51
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e3fde51
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e3fde51
Branch: refs/heads/acl-item-cidrs
Commit: 0e3fde5107b5e66bb749d1d86b8d7198c1c2ba0a
Parents: 80738cc
Author: Laszlo Hornyak <la...@gmail.com>
Authored: Tue Feb 25 20:55:35 2014 +0100
Committer: Laszlo Hornyak <la...@gmail.com>
Committed: Tue Feb 25 21:54:32 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/resource/ResourceManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e3fde51/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 79eb1cb..adad85c 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -50,6 +50,7 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.commons.lang.ObjectUtils;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
@@ -1892,7 +1893,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
// If the server's private IP is the same as is public IP, this host has
// a host-only private network. Don't check for conflicts with the
// private IP address table.
- if (serverPrivateIP != serverPublicIP) {
+ if (!ObjectUtils.equals(serverPrivateIP, serverPublicIP)) {
if (!_privateIPAddressDao.mark(dc.getId(), pod.getId(), serverPrivateIP)) {
// If the server's private IP address is already in the
// database, return false
[11/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/SR.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/SR.java b/deps/XenServerJava/src/com/xensource/xenapi/SR.java
index db6770f..8999158 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/SR.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/SR.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class SR extends XenAPIObject {
* For internal use only.
*/
SR(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class SR extends XenAPIObject {
{
if (obj != null && obj instanceof SR)
{
- SR other = (SR)obj;
+ SR other = (SR) obj;
return other.ref.equals(this.ref);
} else
{
@@ -124,8 +125,8 @@ public class SR extends XenAPIObject {
/**
* Convert a SR.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -232,15 +233,15 @@ public class SR extends XenAPIObject {
* @return all fields from the object
*/
public SR.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSRRecord(result);
+ return Types.toSRRecord(result);
}
/**
@@ -250,15 +251,15 @@ public class SR extends XenAPIObject {
* @return reference to the object
*/
public static SR getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -268,15 +269,15 @@ public class SR extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<SR> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfSR(result);
+ return Types.toSetOfSR(result);
}
/**
@@ -285,15 +286,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -302,15 +303,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -319,15 +320,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -336,15 +337,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Set<Types.StorageOperations> getAllowedOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_allowed_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfStorageOperations(result);
+ return Types.toSetOfStorageOperations(result);
}
/**
@@ -353,15 +354,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Map<String, Types.StorageOperations> getCurrentOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_current_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringStorageOperations(result);
+ return Types.toMapOfStringStorageOperations(result);
}
/**
@@ -370,15 +371,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Set<VDI> getVDIs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_VDIs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVDI(result);
+ return Types.toSetOfVDI(result);
}
/**
@@ -387,15 +388,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Set<PBD> getPBDs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_PBDs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPBD(result);
+ return Types.toSetOfPBD(result);
}
/**
@@ -404,15 +405,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Long getVirtualAllocation(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_virtual_allocation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -421,15 +422,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Long getPhysicalUtilisation(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_physical_utilisation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -438,15 +439,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Long getPhysicalSize(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_physical_size";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -455,15 +456,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public String getType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -472,15 +473,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public String getContentType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_content_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -489,15 +490,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Boolean getShared(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_shared";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -506,15 +507,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -523,15 +524,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Set<String> getTags(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -540,15 +541,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getSmConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_sm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -557,15 +558,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Map<String, Blob> getBlobs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_blobs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringBlob(result);
+ return Types.toMapOfStringBlob(result);
}
/**
@@ -574,15 +575,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public Boolean getLocalCacheEnabled(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_local_cache_enabled";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -591,15 +592,15 @@ public class SR extends XenAPIObject {
* @return value of the field
*/
public DRTask getIntroducedBy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_introduced_by";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDRTask(result);
+ return Types.toDRTask(result);
}
/**
@@ -608,9 +609,9 @@ public class SR extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -625,9 +626,9 @@ public class SR extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -641,9 +642,9 @@ public class SR extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -657,9 +658,9 @@ public class SR extends XenAPIObject {
* @param tags New value to set
*/
public void setTags(Connection c, Set<String> tags) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.set_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(tags)};
@@ -673,9 +674,9 @@ public class SR extends XenAPIObject {
* @param value New value to add
*/
public void addTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.add_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -689,9 +690,9 @@ public class SR extends XenAPIObject {
* @param value Value to remove
*/
public void removeTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.remove_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -705,9 +706,9 @@ public class SR extends XenAPIObject {
* @param smConfig New value to set
*/
public void setSmConfig(Connection c, Map<String, String> smConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.set_sm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(smConfig)};
@@ -722,9 +723,9 @@ public class SR extends XenAPIObject {
* @param value Value to add
*/
public void addToSmConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.add_to_sm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -738,9 +739,9 @@ public class SR extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromSmConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.remove_from_sm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -762,52 +763,14 @@ public class SR extends XenAPIObject {
* @param smConfig Storage backend specific configuration options
* @return Task
*/
- public static Task createAsync(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type,
- String contentType, Boolean shared, Map<String, String> smConfig) throws
- BadServerResponse,
- VersionException,
- XenAPIException,
- XmlRpcException,
- Types.SrUnknownDriver {
-
- if (c.rioConnection) {
- if (smConfig.isEmpty()) {
- return rioCreateAsync(c, host, deviceConfig, physicalSize, nameLabel, nameDescription, type, contentType, shared);
- } else {
- throw new Types.VersionException("smConfig parameter must be empty map for Rio (legacy XenServer) host");
- }
- } else {
- return miamiCreateAsync(c, host, deviceConfig, physicalSize, nameLabel, nameDescription, type, contentType, shared, smConfig);
- }
- }
-
- private static Task rioCreateAsync(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription,
- String type, String contentType, Boolean shared) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException,
- Types.SrUnknownDriver {
+ public static Task createAsync(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type, String contentType, Boolean shared, Map<String, String> smConfig) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrUnknownDriver {
String method_call = "Async.SR.create";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize),
- Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType),
- Marshalling.toXMLRPC(shared)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toTask(result);
- }
-
- private static Task miamiCreateAsync(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription,
- String type, String contentType, Boolean shared, Map<String, String> smConfig) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException,
- Types.SrUnknownDriver {
- String method_call = "Async.SR.create";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize),
- Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType),
- Marshalling.toXMLRPC(shared), Marshalling.toXMLRPC(smConfig)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType), Marshalling.toXMLRPC(shared), Marshalling.toXMLRPC(smConfig)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -827,55 +790,17 @@ public class SR extends XenAPIObject {
* @param smConfig Storage backend specific configuration options
* @return The reference of the newly created Storage Repository.
*/
- public static SR create(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type,
- String contentType, Boolean shared, Map<String, String> smConfig) throws
- BadServerResponse,
- VersionException,
- XenAPIException,
- XmlRpcException,
- Types.SrUnknownDriver {
-
- if (c.rioConnection) {
- if (smConfig.isEmpty()) {
- return rioCreate(c, host, deviceConfig, physicalSize, nameLabel, nameDescription, type, contentType, shared);
- } else {
- throw new Types.VersionException("smConfig parameter must be empty map for Rio (legacy XenServer) host");
- }
- } else {
- return miamiCreate(c, host, deviceConfig, physicalSize, nameLabel, nameDescription, type, contentType, shared, smConfig);
- }
- }
-
- private static SR rioCreate(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type,
- String contentType, Boolean shared) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException,
- Types.SrUnknownDriver {
- String method_call = "SR.create";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize),
- Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType),
- Marshalling.toXMLRPC(shared)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toSR(result);
- }
-
- private static SR miamiCreate(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type,
- String contentType, Boolean shared, Map<String, String> smConfig) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException,
- Types.SrUnknownDriver {
+ public static SR create(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type, String contentType, Boolean shared, Map<String, String> smConfig) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrUnknownDriver {
String method_call = "SR.create";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize),
- Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType),
- Marshalling.toXMLRPC(shared), Marshalling.toXMLRPC(smConfig)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType), Marshalling.toXMLRPC(shared), Marshalling.toXMLRPC(smConfig)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -890,46 +815,13 @@ public class SR extends XenAPIObject {
* @param smConfig Storage backend specific configuration options
* @return Task
*/
- public static Task introduceAsync(Connection c, String uuid, String nameLabel, String nameDescription, String type, String contentType, Boolean shared,
- Map<String, String> smConfig) throws
- BadServerResponse,
- VersionException,
- XenAPIException,
- XmlRpcException {
-
- if (c.rioConnection) {
- if (smConfig.isEmpty()) {
- return rioIntroduceAsync(c, uuid, nameLabel, nameDescription, type, contentType, shared);
- } else {
- throw new Types.VersionException("smConfig parameter must be empty map for Rio (legacy XenServer) host");
- }
- } else {
- return miamiIntroduceAsync(c, uuid, nameLabel, nameDescription, type, contentType, shared, smConfig);
- }
- }
-
- private static Task rioIntroduceAsync(Connection c, String uuid, String nameLabel, String nameDescription, String type, String contentType, Boolean shared) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
- String method_call = "Async.SR.introduce";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription),
- Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType), Marshalling.toXMLRPC(shared)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toTask(result);
- }
-
- private static Task miamiIntroduceAsync(Connection c, String uuid, String nameLabel, String nameDescription, String type, String contentType, Boolean shared,
- Map<String, String> smConfig) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
+ public static Task introduceAsync(Connection c, String uuid, String nameLabel, String nameDescription, String type, String contentType, Boolean shared, Map<String, String> smConfig) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.introduce";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription),
- Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType), Marshalling.toXMLRPC(shared), Marshalling.toXMLRPC(smConfig)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType), Marshalling.toXMLRPC(shared), Marshalling.toXMLRPC(smConfig)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -947,49 +839,16 @@ public class SR extends XenAPIObject {
* @param smConfig Storage backend specific configuration options
* @return The reference of the newly introduced Storage Repository.
*/
- public static SR introduce(Connection c, String uuid, String nameLabel, String nameDescription, String type, String contentType, Boolean shared,
- Map<String, String> smConfig) throws
- BadServerResponse,
- VersionException,
- XenAPIException,
- XmlRpcException {
-
- if (c.rioConnection) {
- if (smConfig.isEmpty()) {
- return rioIntroduce(c, uuid, nameLabel, nameDescription, type, contentType, shared);
- } else {
- throw new Types.VersionException("smConfig parameter must be empty map for Rio (legacy XenServer) host");
- }
- } else {
- return miamiIntroduce(c, uuid, nameLabel, nameDescription, type, contentType, shared, smConfig);
- }
- }
-
- private static SR rioIntroduce(Connection c, String uuid, String nameLabel, String nameDescription, String type, String contentType, Boolean shared) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
+ public static SR introduce(Connection c, String uuid, String nameLabel, String nameDescription, String type, String contentType, Boolean shared, Map<String, String> smConfig) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.introduce";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription),
- Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType), Marshalling.toXMLRPC(shared)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType), Marshalling.toXMLRPC(shared), Marshalling.toXMLRPC(smConfig)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
- }
-
- private static SR miamiIntroduce(Connection c, String uuid, String nameLabel, String nameDescription, String type, String contentType, Boolean shared,
- Map<String, String> smConfig) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
- String method_call = "SR.introduce";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription),
- Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType), Marshalling.toXMLRPC(shared), Marshalling.toXMLRPC(smConfig)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -1006,51 +865,13 @@ public class SR extends XenAPIObject {
* @param smConfig Storage backend specific configuration options
* @return Task
*/
- @Deprecated
- public static Task makeAsync(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type,
- String contentType, Map<String, String> smConfig) throws
- BadServerResponse,
- VersionException,
- XenAPIException,
- XmlRpcException {
-
- if (c.rioConnection) {
- if (smConfig.isEmpty()) {
- return rioMakeAsync(c, host, deviceConfig, physicalSize, nameLabel, nameDescription, type, contentType);
- } else {
- throw new Types.VersionException("smConfig parameter must be empty map for Rio (legacy XenServer) host");
- }
- } else {
- return miamiMakeAsync(c, host, deviceConfig, physicalSize, nameLabel, nameDescription, type, contentType, smConfig);
- }
- }
-
- @Deprecated
- private static Task rioMakeAsync(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type,
- String contentType) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
+ @Deprecated public static Task makeAsync(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type, String contentType, Map<String, String> smConfig) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.make";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize),
- Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toTask(result);
- }
-
- @Deprecated
- private static Task miamiMakeAsync(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription,
- String type, String contentType, Map<String, String> smConfig) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
- String method_call = "Async.SR.make";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize),
- Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType),
- Marshalling.toXMLRPC(smConfig)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType), Marshalling.toXMLRPC(smConfig)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1070,54 +891,16 @@ public class SR extends XenAPIObject {
* @param smConfig Storage backend specific configuration options
* @return The uuid of the newly created Storage Repository.
*/
- @Deprecated
- public static String make(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type,
- String contentType, Map<String, String> smConfig) throws
- BadServerResponse,
- VersionException,
- XenAPIException,
- XmlRpcException {
-
- if (c.rioConnection) {
- if (smConfig.isEmpty()) {
- return rioMake(c, host, deviceConfig, physicalSize, nameLabel, nameDescription, type, contentType);
- } else {
- throw new Types.VersionException("smConfig parameter must be empty map for Rio (legacy XenServer) host");
- }
- } else {
- return miamiMake(c, host, deviceConfig, physicalSize, nameLabel, nameDescription, type, contentType, smConfig);
- }
- }
-
- @Deprecated
- private static String rioMake(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type,
- String contentType) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
- String method_call = "SR.make";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize),
- Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toString(result);
- }
-
- @Deprecated
- private static String miamiMake(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type,
- String contentType, Map<String, String> smConfig) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
+ @Deprecated public static String make(Connection c, Host host, Map<String, String> deviceConfig, Long physicalSize, String nameLabel, String nameDescription, String type, String contentType, Map<String, String> smConfig) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.make";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize),
- Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType),
- Marshalling.toXMLRPC(smConfig)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(physicalSize), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(contentType), Marshalling.toXMLRPC(smConfig)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1126,10 +909,10 @@ public class SR extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SrHasPbd {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrHasPbd {
String method_call = "Async.SR.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1143,10 +926,10 @@ public class SR extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SrHasPbd {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrHasPbd {
String method_call = "SR.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1160,10 +943,10 @@ public class SR extends XenAPIObject {
* @return Task
*/
public Task forgetAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SrHasPbd {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrHasPbd {
String method_call = "Async.SR.forget";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1177,10 +960,10 @@ public class SR extends XenAPIObject {
*
*/
public void forget(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SrHasPbd {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrHasPbd {
String method_call = "SR.forget";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1194,9 +977,9 @@ public class SR extends XenAPIObject {
* @return Task
*/
public Task updateAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.update";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1210,9 +993,9 @@ public class SR extends XenAPIObject {
*
*/
public void update(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.update";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1226,15 +1009,15 @@ public class SR extends XenAPIObject {
* @return the supported SR types
*/
public static Set<String> getSupportedTypes(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_supported_types";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -1243,9 +1026,9 @@ public class SR extends XenAPIObject {
* @return Task
*/
public Task scanAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.scan";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1259,9 +1042,9 @@ public class SR extends XenAPIObject {
*
*/
public void scan(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.scan";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1279,13 +1062,12 @@ public class SR extends XenAPIObject {
* @return Task
*/
public static Task probeAsync(Connection c, Host host, Map<String, String> deviceConfig, String type, Map<String, String> smConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.probe";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(type),
- Marshalling.toXMLRPC(smConfig)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(smConfig)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1301,16 +1083,15 @@ public class SR extends XenAPIObject {
* @return An XML fragment containing the scan results. These are specific to the scan being performed, and the backend.
*/
public static String probe(Connection c, Host host, Map<String, String> deviceConfig, String type, Map<String, String> smConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.probe";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(type),
- Marshalling.toXMLRPC(smConfig)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(deviceConfig), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(smConfig)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1320,9 +1101,9 @@ public class SR extends XenAPIObject {
* @return Task
*/
public Task setSharedAsync(Connection c, Boolean value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.set_shared";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1337,9 +1118,9 @@ public class SR extends XenAPIObject {
* @param value True if the SR is shared
*/
public void setShared(Connection c, Boolean value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.set_shared";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1354,9 +1135,9 @@ public class SR extends XenAPIObject {
* @return Task
*/
public Task setNameLabelAsync(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1371,9 +1152,9 @@ public class SR extends XenAPIObject {
* @param value The name label for the SR
*/
public void setNameLabel(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1388,9 +1169,9 @@ public class SR extends XenAPIObject {
* @return Task
*/
public Task setNameDescriptionAsync(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1405,9 +1186,9 @@ public class SR extends XenAPIObject {
* @param value The name description for the SR
*/
public void setNameDescription(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1424,13 +1205,12 @@ public class SR extends XenAPIObject {
* @return Task
*/
public Task createNewBlobAsync(Connection c, String name, String mimeType, Boolean _public) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.create_new_blob";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType),
- Marshalling.toXMLRPC(_public)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType), Marshalling.toXMLRPC(_public)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1445,16 +1225,15 @@ public class SR extends XenAPIObject {
* @return The reference of the blob, needed for populating its data
*/
public Blob createNewBlob(Connection c, String name, String mimeType, Boolean _public) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.create_new_blob";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType),
- Marshalling.toXMLRPC(_public)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType), Marshalling.toXMLRPC(_public)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBlob(result);
+ return Types.toBlob(result);
}
/**
@@ -1463,9 +1242,9 @@ public class SR extends XenAPIObject {
* @param value The new value of the SR's physical_size
*/
public void setPhysicalSize(Connection c, Long value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.set_physical_size";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1479,9 +1258,9 @@ public class SR extends XenAPIObject {
* @param value The new value of the SR's virtual_allocation
*/
public void setVirtualAllocation(Connection c, Long value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.set_virtual_allocation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1495,9 +1274,9 @@ public class SR extends XenAPIObject {
* @param value The new value of the SR's physical utilisation
*/
public void setPhysicalUtilisation(Connection c, Long value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.set_physical_utilisation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1511,9 +1290,9 @@ public class SR extends XenAPIObject {
* @return Task
*/
public Task assertCanHostHaStatefileAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.assert_can_host_ha_statefile";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1527,9 +1306,9 @@ public class SR extends XenAPIObject {
*
*/
public void assertCanHostHaStatefile(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.assert_can_host_ha_statefile";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1543,9 +1322,9 @@ public class SR extends XenAPIObject {
* @return Task
*/
public Task assertSupportsDatabaseReplicationAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.assert_supports_database_replication";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1559,9 +1338,9 @@ public class SR extends XenAPIObject {
*
*/
public void assertSupportsDatabaseReplication(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.assert_supports_database_replication";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1570,14 +1349,14 @@ public class SR extends XenAPIObject {
}
/**
- *
+ *
*
* @return Task
*/
public Task enableDatabaseReplicationAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.enable_database_replication";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1587,13 +1366,13 @@ public class SR extends XenAPIObject {
}
/**
- *
+ *
*
*/
public void enableDatabaseReplication(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.enable_database_replication";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1602,14 +1381,14 @@ public class SR extends XenAPIObject {
}
/**
- *
+ *
*
* @return Task
*/
public Task disableDatabaseReplicationAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.SR.disable_database_replication";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1619,13 +1398,13 @@ public class SR extends XenAPIObject {
}
/**
- *
+ *
*
*/
public void disableDatabaseReplication(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.disable_database_replication";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1639,15 +1418,15 @@ public class SR extends XenAPIObject {
* @return references to all objects
*/
public static Set<SR> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfSR(result);
+ return Types.toSetOfSR(result);
}
/**
@@ -1656,15 +1435,15 @@ public class SR extends XenAPIObject {
* @return records of all objects
*/
public static Map<SR, SR.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SR.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfSRSRRecord(result);
+ return Types.toMapOfSRSRRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Secret.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Secret.java b/deps/XenServerJava/src/com/xensource/xenapi/Secret.java
index 870725f..418bb88 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Secret.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Secret.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Secret extends XenAPIObject {
* For internal use only.
*/
Secret(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Secret extends XenAPIObject {
{
if (obj != null && obj instanceof Secret)
{
- Secret other = (Secret)obj;
+ Secret other = (Secret) obj;
return other.ref.equals(this.ref);
} else
{
@@ -108,8 +109,8 @@ public class Secret extends XenAPIObject {
/**
* Convert a secret.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("value", this.value == null ? "" : this.value);
map.put("other_config", this.otherConfig == null ? new HashMap<String, String>() : this.otherConfig);
@@ -136,15 +137,15 @@ public class Secret extends XenAPIObject {
* @return all fields from the object
*/
public Secret.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSecretRecord(result);
+ return Types.toSecretRecord(result);
}
/**
@@ -154,15 +155,15 @@ public class Secret extends XenAPIObject {
* @return reference to the object
*/
public static Secret getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSecret(result);
+ return Types.toSecret(result);
}
/**
@@ -172,9 +173,9 @@ public class Secret extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, Secret.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.secret.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -191,16 +192,16 @@ public class Secret extends XenAPIObject {
* @return reference to the newly created object
*/
public static Secret create(Connection c, Secret.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSecret(result);
+ return Types.toSecret(result);
}
/**
@@ -209,9 +210,9 @@ public class Secret extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.secret.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -225,9 +226,9 @@ public class Secret extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -241,15 +242,15 @@ public class Secret extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -258,15 +259,15 @@ public class Secret extends XenAPIObject {
* @return value of the field
*/
public String getValue(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.get_value";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -275,15 +276,15 @@ public class Secret extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -292,9 +293,9 @@ public class Secret extends XenAPIObject {
* @param value New value to set
*/
public void setValue(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.set_value";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -308,9 +309,9 @@ public class Secret extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -325,9 +326,9 @@ public class Secret extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -341,9 +342,9 @@ public class Secret extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -357,15 +358,15 @@ public class Secret extends XenAPIObject {
* @return references to all objects
*/
public static Set<Secret> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfSecret(result);
+ return Types.toSetOfSecret(result);
}
/**
@@ -374,15 +375,15 @@ public class Secret extends XenAPIObject {
* @return records of all objects
*/
public static Map<Secret, Secret.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "secret.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfSecretSecretRecord(result);
+ return Types.toMapOfSecretSecretRecord(result);
}
}
\ No newline at end of file
[22/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Add Gluster to the list of protocols in the Management Server
Gluster can now be used for Primary Storage just like NFS. This change adds the
Gluster protocol to the Management Server:
Infrastructure -> Primary Storage -> Add Primary Storage
And also add the option to create Primary Storage on Gluster when
following the 'Add Zone' wizard from:
Infrastructure -> Zones -> Add Zone
Some screenshots and verification:
- http://blog.nixpanic.net/2013/12/using-gluster-as-primary-storage-in.html
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c02197ae
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c02197ae
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c02197ae
Branch: refs/heads/acl-item-cidrs
Commit: c02197ae86ba90ee4553fa437a1200e64915649f
Parents: e883877
Author: Niels de Vos <nd...@redhat.com>
Authored: Sat Nov 23 14:30:40 2013 -0700
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Feb 25 12:08:46 2014 +0100
----------------------------------------------------------------------
.../classes/resources/messages.properties | 1 +
ui/dictionary.jsp | 1 +
ui/scripts/sharedFunctions.js | 9 +++
ui/scripts/system.js | 69 +++++++++++++++++++-
ui/scripts/zoneWizard.js | 51 ++++++++++++++-
5 files changed, 127 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02197ae/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index bd4a27d..a1752f2 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -603,6 +603,7 @@ label.full=Full
label.gateway=Gateway
label.general.alerts=General Alerts
label.generating.url=Generating URL
+label.gluster.volume=Volume
label.go.step.2=Go to Step 2
label.go.step.3=Go to Step 3
label.go.step.4=Go to Step 4
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02197ae/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 7ccb466..bf48417 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -607,6 +607,7 @@ dictionary = {
'label.gateway': '<fmt:message key="label.gateway" />',
'label.general.alerts': '<fmt:message key="label.general.alerts" />',
'label.generating.url': '<fmt:message key="label.generating.url" />',
+'label.gluster.volume': '<fmt:message key="label.gluster.volume" />',
'label.go.step.2': '<fmt:message key="label.go.step.2" />',
'label.go.step.3': '<fmt:message key="label.go.step.3" />',
'label.go.step.4': '<fmt:message key="label.go.step.4" />',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02197ae/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 9fa70e3..f0afea5 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -1340,6 +1340,15 @@ var processPropertiesInImagestoreObject = function(jsonObj) {
return url;
}
+ function glusterURL(server, path) {
+ var url;
+ if (server.indexOf("://") == -1)
+ url = "gluster://" + server + path;
+ else
+ url = server + path;
+ return url;
+ }
+
//VM Instance
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02197ae/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 8159124..1f64a52 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -15171,6 +15171,10 @@
id: "clvm",
description: "CLVM"
});
+ items.push({
+ id: "gluster",
+ description: "Gluster"
+ });
args.response.success({
data: items
});
@@ -15277,6 +15281,8 @@
$form.find('.form-item[rel=rbdpool]').hide();
$form.find('.form-item[rel=rbdid]').hide();
$form.find('.form-item[rel=rbdsecret]').hide();
+
+ $form.find('.form-item[rel=glustervolume]').hide();
} else if (protocol == "SMB") {
//"SMB" show almost the same fields as "nfs" does, except 3 more SMB-specific fields.
$form.find('.form-item[rel=server]').css('display', 'inline-block');
@@ -15302,6 +15308,8 @@
$form.find('.form-item[rel=rbdpool]').hide();
$form.find('.form-item[rel=rbdid]').hide();
$form.find('.form-item[rel=rbdsecret]').hide();
+
+ $form.find('.form-item[rel=glustervolume]').hide();
} else if (protocol == "ocfs2") {
//ocfs2 is the same as nfs, except no server field.
$form.find('.form-item[rel=server]').hide();
@@ -15327,6 +15335,8 @@
$form.find('.form-item[rel=rbdpool]').hide();
$form.find('.form-item[rel=rbdid]').hide();
$form.find('.form-item[rel=rbdsecret]').hide();
+
+ $form.find('.form-item[rel=glustervolume]').hide();
} else if (protocol == "PreSetup") {
$form.find('.form-item[rel=server]').hide();
$form.find('.form-item[rel=server]').find(".value").find("input").val("localhost");
@@ -15351,6 +15361,8 @@
$form.find('.form-item[rel=rbdpool]').hide();
$form.find('.form-item[rel=rbdid]').hide();
$form.find('.form-item[rel=rbdsecret]').hide();
+
+ $form.find('.form-item[rel=glustervolume]').hide();
} else if (protocol == "iscsi") {
$form.find('.form-item[rel=server]').css('display', 'inline-block');
$form.find('.form-item[rel=server]').find(".value").find("input").val("");
@@ -15373,6 +15385,8 @@
$form.find('.form-item[rel=rbdpool]').hide();
$form.find('.form-item[rel=rbdid]').hide();
$form.find('.form-item[rel=rbdsecret]').hide();
+
+ $form.find('.form-item[rel=glustervolume]').hide();
} else if ($(this).val() == "clvm") {
$form.find('.form-item[rel=server]').hide();
$form.find('.form-item[rel=server]').find(".value").find("input").val("localhost");
@@ -15395,6 +15409,8 @@
$form.find('.form-item[rel=rbdpool]').hide();
$form.find('.form-item[rel=rbdid]').hide();
$form.find('.form-item[rel=rbdsecret]').hide();
+
+ $form.find('.form-item[rel=glustervolume]').hide();
} else if (protocol == "vmfs") {
$form.find('.form-item[rel=server]').css('display', 'inline-block');
$form.find('.form-item[rel=server]').find(".value").find("input").val("");
@@ -15417,6 +15433,8 @@
$form.find('.form-item[rel=rbdpool]').hide();
$form.find('.form-item[rel=rbdid]').hide();
$form.find('.form-item[rel=rbdsecret]').hide();
+
+ $form.find('.form-item[rel=glustervolume]').hide();
} else if (protocol == "SharedMountPoint") {
//"SharedMountPoint" show the same fields as "nfs" does.
$form.find('.form-item[rel=server]').hide();
@@ -15442,6 +15460,8 @@
$form.find('.form-item[rel=rbdpool]').hide();
$form.find('.form-item[rel=rbdid]').hide();
$form.find('.form-item[rel=rbdsecret]').hide();
+
+ $form.find('.form-item[rel=glustervolume]').hide();
} else if (protocol == "rbd") {
$form.find('.form-item[rel=rbdmonitor]').css('display', 'inline-block');
$form.find('.form-item[rel=rbdmonitor]').find(".name").find("label").text("RADOS Monitor:");
@@ -15466,6 +15486,33 @@
$form.find('.form-item[rel=smbUsername]').hide();
$form.find('.form-item[rel=smbPassword]').hide();
$form.find('.form-item[rel=smbDomain]').hide();
+
+ $form.find('.form-item[rel=glustervolume]').hide();
+ } else if (protocol == "gluster") {
+ $form.find('.form-item[rel=server]').css('display', 'inline-block');
+ $form.find('.form-item[rel=server]').find(".value").find("input");
+
+ $form.find('.form-item[rel=glustervolume]').css('display', 'inline-block');
+ $form.find('.form-item[rel=glustervolume]').find(".name").find("label").text("Volume:");
+
+ $form.find('.form-item[rel=path]').hide();
+
+ $form.find('.form-item[rel=smbUsername]').hide();
+ $form.find('.form-item[rel=smbPassword]').hide();
+ $form.find('.form-item[rel=smbDomain]').hide();
+
+ $form.find('.form-item[rel=iqn]').hide();
+ $form.find('.form-item[rel=lun]').hide();
+
+ $form.find('.form-item[rel=volumegroup]').hide();
+
+ $form.find('.form-item[rel=vCenterDataCenter]').hide();
+ $form.find('.form-item[rel=vCenterDataStore]').hide();
+
+ $form.find('.form-item[rel=rbdmonitor]').hide();
+ $form.find('.form-item[rel=rbdpool]').hide();
+ $form.find('.form-item[rel=rbdid]').hide();
+ $form.find('.form-item[rel=rbdsecret]').hide();
} else {
$form.find('.form-item[rel=server]').css('display', 'inline-block');
$form.find('.form-item[rel=server]').find(".value").find("input").val("");
@@ -15486,6 +15533,8 @@
$form.find('.form-item[rel=smbUsername]').hide();
$form.find('.form-item[rel=smbPassword]').hide();
$form.find('.form-item[rel=smbDomain]').hide();
+
+ $form.find('.form-item[rel=glustervolume]').hide();
}
});
@@ -15613,7 +15662,16 @@
},
isHidden: true
},
-
+
+ //gluster
+ glustervolume: {
+ label: 'label.gluster.volume',
+ validation: {
+ required: true
+ },
+ isHidden: true
+ },
+
//always appear (begin)
storageTags: {
label: 'label.storage.tags',
@@ -15698,6 +15756,12 @@
path = "/" + path;
path += "/" + args.data.vCenterDataStore;
url = vmfsURL("dummy", path);
+ } else if (args.data.protocol == "gluster") {
+ var glustervolume = args.data.glustervolume;
+
+ if (glustervolume.substring(0, 1) != "/")
+ glustervolume = "/" + glustervolume;
+ url = glusterURL(server, glustervolume);
} else {
var iqn = args.data.iqn;
if (iqn.substring(0, 1) != "/")
@@ -16903,8 +16967,7 @@
}
},
//SMB (end)
-
-
+
//S3 (begin)
accesskey: {
label: 'label.s3.access_key',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02197ae/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index fd5705b..2691586 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1486,6 +1486,10 @@
id: "clvm",
description: "CLVM"
});
+ items.push({
+ id: "gluster",
+ description: "Gluster"
+ });
args.response.success({
data: items
});
@@ -1587,8 +1591,9 @@
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
+ $form.find('[rel=glustervolume]').hide();
} else if (protocol == "SMB") { //"SMB" show almost the same fields as "nfs" does, except 3 more SMB-specific fields.
- $form.find('[rel=server]').css('display', 'block');
+ $form.find('[rel=server]').css('display', 'block');
$form.find('[rel=server]').find(".value").find("input").val("");
$form.find('[rel=path]').css('display', 'block');
@@ -1604,6 +1609,8 @@
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').hide();
} else if (protocol == "ocfs2") { //ocfs2 is the same as nfs, except no server field.
$form.find('[rel=server]').hide();
$form.find('[rel=server]').find(".value").find("input").val("");
@@ -1621,6 +1628,8 @@
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').hide();
} else if (protocol == "PreSetup") {
$form.find('[rel=server]').hide();
$form.find('[rel=server]').find(".value").find("input").val("localhost");
@@ -1639,6 +1648,8 @@
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').hide();
} else if (protocol == "iscsi") {
$form.find('[rel=server]').css('display', 'block');
$form.find('[rel=server]').find(".value").find("input").val("");
@@ -1656,6 +1667,8 @@
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').hide();
} else if ($(this).val() == "clvm") {
$form.find('[rel=server]').hide();
$form.find('[rel=server]').find(".value").find("input").val("localhost");
@@ -1673,6 +1686,8 @@
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').hide();
} else if (protocol == "vmfs") {
$form.find('[rel=server]').css('display', 'block');
$form.find('[rel=server]').find(".value").find("input").val("");
@@ -1690,6 +1705,8 @@
$form.find('[rel=vCenterDataCenter]').css('display', 'block');
$form.find('[rel=vCenterDataStore]').css('display', 'block');
+
+ $form.find('[rel=glustervolume]').hide();
} else if (protocol == "SharedMountPoint") { //"SharedMountPoint" show the same fields as "nfs" does.
$form.find('[rel=server]').hide();
$form.find('[rel=server]').find(".value").find("input").val("localhost");
@@ -1707,6 +1724,27 @@
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').hide();
+ } else if (protocol == "gluster") {
+ $form.find('[rel=server]').css('display', 'block');
+ $form.find('[rel=server]').find(".value").find("input").val("");
+
+ $form.find('[rel=path]').hide();
+
+ $form.find('[rel=smbUsername]').hide();
+ $form.find('[rel=smbPassword]').hide();
+ $form.find('[rel=smbDomain]').hide();
+
+ $form.find('[rel=iqn]').hide();
+ $form.find('[rel=lun]').hide();
+
+ $form.find('[rel=volumegroup]').hide();
+
+ $form.find('[rel=vCenterDataCenter]').hide();
+ $form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').css('display', 'block');
} else {
$form.find('[rel=server]').css('display', 'block');
$form.find('[rel=server]').find(".value").find("input").val("");
@@ -1722,6 +1760,8 @@
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').hide();
}
});
@@ -1810,6 +1850,15 @@
isHidden: true
},
+ //gluster
+ glustervolume: {
+ label: 'label.gluster.volume',
+ validation: {
+ required: true
+ },
+ isHidden: true
+ },
+
//always appear (begin)
storageTags: {
label: 'label.storage.tags',
[29/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Prevent any attempt at using askpass during management server startup
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/169cd6f9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/169cd6f9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/169cd6f9
Branch: refs/heads/acl-item-cidrs
Commit: 169cd6f9395ebfda888a21b4464d9695c5347e5f
Parents: afc188c
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Feb 25 16:02:48 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 25 16:02:48 2014 +0100
----------------------------------------------------------------------
scripts/vm/systemvm/injectkeys.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/169cd6f9/scripts/vm/systemvm/injectkeys.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/systemvm/injectkeys.sh b/scripts/vm/systemvm/injectkeys.sh
index c17a3c6..cd5d9f9 100755
--- a/scripts/vm/systemvm/injectkeys.sh
+++ b/scripts/vm/systemvm/injectkeys.sh
@@ -71,7 +71,7 @@ copy_priv_key() {
if [[ "$EUID" -ne 0 ]]
then
- SUDO="sudo "
+ SUDO="sudo -n "
fi
$SUDO mkdir -p $MOUNTPATH
[26/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
templates: Add FreeBSD 10 template
With VirtIO enabled on KVM. FreeBSD 10 supports VirtIO for both the
network and the disks. This frees us from IDE and E1000 which should
also improve performance.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/abf3c055
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/abf3c055
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/abf3c055
Branch: refs/heads/acl-item-cidrs
Commit: abf3c055c22cf504a79066b1ec5ec3ac022a486c
Parents: bb23e3a
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Feb 18 17:44:38 2014 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Feb 25 14:56:24 2014 +0100
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java | 2 ++
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +-
setup/db/db/schema-430to440.sql | 3 ++-
setup/db/templates.sql | 2 ++
4 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abf3c055/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java
index f76b8a7..11d1e16 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMGuestOsMapper.java
@@ -126,6 +126,8 @@ public class KVMGuestOsMapper {
s_mapper.put("Windows NT 4", "Windows NT");
s_mapper.put("Windows 3.1", "Windows 3.1");
s_mapper.put("Windows PV", "Other PV");
+ s_mapper.put("FreeBSD 10 (32-bit)", "FreeBSD 10");
+ s_mapper.put("FreeBSD 10 (64-bits", "FreeBSD 10");
s_mapper.put("Other PV (32-bit)", "Other PV");
s_mapper.put("Other PV (64-bit)", "Other PV");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abf3c055/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 26407a1..853b7a9 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -4694,7 +4694,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
guestOSName.startsWith("CentOS 5.5") || guestOS.startsWith("CentOS") || guestOS.startsWith("Fedora") ||
guestOSName.startsWith("Red Hat Enterprise Linux 5.3") || guestOSName.startsWith("Red Hat Enterprise Linux 5.4") ||
guestOSName.startsWith("Red Hat Enterprise Linux 5.5") || guestOSName.startsWith("Red Hat Enterprise Linux 6") || guestOS.startsWith("Debian GNU/Linux") ||
- guestOSName.startsWith("Other PV")) {
+ guestOSName.startsWith("FreeBSD 10") || guestOSName.startsWith("Other PV")) {
return true;
} else {
return false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abf3c055/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 116731d..0ded7a9 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -540,4 +540,5 @@ ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `display` tinyint(1) NOT NULL
ALTER TABLE `cloud`.`s2s_vpn_connection` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the entry can be displayed to the end user';
ALTER TABLE `cloud`.`s2s_vpn_gateway` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the entry can be displayed to the end user';
-
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (225, UUID(), 9, 'FreeBSD 10 (32-bit)');
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (226, UUID(), 9, 'FreeBSD 10 (64-bit)');
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abf3c055/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 5b46c9a..a99a6cd 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -272,6 +272,8 @@ INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (221
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (222, UUID(), 7, 'Apple Mac OS X 10.6 (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (223, UUID(), 7, 'Apple Mac OS X 10.7 (32-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (224, UUID(), 7, 'Apple Mac OS X 10.7 (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (225, UUID(), 9, 'FreeBSD 10 (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (226, UUID(), 9, 'FreeBSD 10 (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (200, UUID(), 1, 'Other CentOS (32-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (201, UUID(), 1, 'Other CentOS (64-bit)');
[31/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
BUG-ID: CLOUDSTACK-6162: UI > zone > physical network > service provider > add OVS.
Reviewed-by: Brian
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/80738cce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80738cce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80738cce
Branch: refs/heads/acl-item-cidrs
Commit: 80738cce053871d078c12e758eda7f1418bbfd8a
Parents: ef54710
Author: Jessica Wang <je...@apache.org>
Authored: Tue Feb 25 12:13:31 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Tue Feb 25 12:13:31 2014 -0800
----------------------------------------------------------------------
ui/scripts/system.js | 133 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 133 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80738cce/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 1f64a52..7668083 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -199,6 +199,16 @@
return allowedActions;
};
+ function ovsProviderActionFilter(args) {
+ var allowedActions = [];
+ var jsonObj = args.context.item; //args.context.item == nspMap["virtualRouter"]
+ if (jsonObj.state == "Enabled")
+ allowedActions.push("disable");
+ else if (jsonObj.state == "Disabled")
+ allowedActions.push("enable");
+ return allowedActions;
+ };
+
cloudStack.sections.system = {
title: 'label.menu.infrastructure',
id: 'system',
@@ -3908,6 +3918,120 @@
}
},
+ OVS: {
+ id: "OVS",
+ label: "OVS",
+ isMaximized: true,
+ type: 'detailView',
+ fields: {
+ name: {
+ label: 'label.name'
+ },
+ state: {
+ label: 'label.status',
+ indicator: {
+ 'Enabled': 'on'
+ }
+ }
+ },
+ tabs: {
+ network: {
+ title: 'label.network',
+ fields: [{
+ name: {
+ label: 'label.name'
+ }
+ }, {
+ state: {
+ label: 'label.state'
+ },
+ supportedServices: {
+ label: 'label.supported.services'
+ },
+ id: {
+ label: 'label.id'
+ },
+ physicalnetworkid: {
+ label: 'label.physical.network.ID'
+ }
+ }],
+ dataProvider: function(args) {
+ refreshNspData("OVS");
+ args.response.success({
+ actionFilter: ovsProviderActionFilter,
+ data: $.extend(nspMap["OVS"], {
+ supportedServices: nspMap["OVS"] == undefined? "": nspMap["OVS"].servicelist.join(', ')
+ })
+ });
+ }
+ },
+ },
+ actions: {
+ enable: {
+ label: 'label.enable.provider',
+ action: function(args) {
+ $.ajax({
+ url: createURL("updateNetworkServiceProvider&id=" + nspMap["OVS"].id + "&state=Enabled"),
+ dataType: "json",
+ success: function(json) {
+ var jid = json.updatenetworkserviceproviderresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid,
+ getUpdatedItem: function(json) {
+ $(window).trigger('cloudStack.fullRefresh');
+ }
+ }
+ });
+ }
+ });
+ },
+ messages: {
+ confirm: function(args) {
+ return 'message.confirm.enable.provider';
+ },
+ notification: function() {
+ return 'label.enable.provider';
+ }
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+ disable: {
+ label: 'label.disable.provider',
+ action: function(args) {
+ $.ajax({
+ url: createURL("updateNetworkServiceProvider&id=" + nspMap["OVS"].id + "&state=Disabled"),
+ dataType: "json",
+ success: function(json) {
+ var jid = json.updatenetworkserviceproviderresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid,
+ getUpdatedItem: function(json) {
+ $(window).trigger('cloudStack.fullRefresh');
+ }
+ }
+ });
+ }
+ });
+ },
+ messages: {
+ confirm: function(args) {
+ return 'message.confirm.disable.provider';
+ },
+ notification: function() {
+ return 'label.disable.provider';
+ }
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ }
+ }
+ },
+
// NetScaler provider detail view
netscaler: {
type: 'detailView',
@@ -19002,6 +19126,9 @@
case "VpcVirtualRouter":
nspMap[ "vpcVirtualRouter"] = items[i];
break;
+ case "OVS":
+ nspMap["OVS"] = items[i];
+ break;
case "Netscaler":
nspMap[ "netscaler"] = items[i];
break;
@@ -19131,6 +19258,12 @@
state: nspMap.pa ? nspMap.pa.state: 'Disabled'
});
}
+
+ nspHardcodingArray.push({
+ id: 'OVS',
+ name: 'OVS',
+ state: nspMap.OVS ? nspMap.OVS.state : 'Disabled'
+ });
};
cloudStack.actionFilter.physicalNetwork = function (args) {
[27/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
FindBugs findings: fixing equals() methods in 2 classes; commenting out dead variable in 1 class; adding 5 tests to cover the changes in the equals() methods.
Signed-off-by: Hugo Trippaers <ht...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a7e4103
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a7e4103
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a7e4103
Branch: refs/heads/acl-item-cidrs
Commit: 3a7e4103fc2ca54e82d597288acd76332b054b98
Parents: abf3c05
Author: wrodrigues <wr...@schubergphilis.com>
Authored: Sat Feb 15 13:23:35 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 25 15:18:16 2014 +0100
----------------------------------------------------------------------
.../com/cloud/agent/manager/AgentAttache.java | 40 +++++-----
.../agent/manager/ClusteredAgentAttache.java | 18 ++---
.../agent/manager/ConnectedAgentAttache.java | 33 ++++++--
.../service/api/ProvisioningServiceImpl.java | 34 ++++----
.../manager/ConnectedAgentAttacheTest.java | 82 ++++++++++++++++++++
5 files changed, 155 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a7e4103/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
index 3ebaf4a..fd1531e 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
@@ -32,9 +32,8 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.log4j.Logger;
import com.cloud.agent.Listener;
import com.cloud.agent.api.Answer;
@@ -72,7 +71,7 @@ public abstract class AgentAttache {
protected static final Comparator<Request> s_reqComparator = new Comparator<Request>() {
@Override
- public int compare(Request o1, Request o2) {
+ public int compare(final Request o1, final Request o2) {
long seq1 = o1.getSequence();
long seq2 = o2.getSequence();
if (seq1 < seq2) {
@@ -87,7 +86,7 @@ public abstract class AgentAttache {
protected static final Comparator<Object> s_seqComparator = new Comparator<Object>() {
@Override
- public int compare(Object o1, Object o2) {
+ public int compare(final Object o1, final Object o2) {
long seq1 = ((Request)o1).getSequence();
long seq2 = (Long)o2;
if (seq1 < seq2) {
@@ -122,7 +121,7 @@ public abstract class AgentAttache {
Arrays.sort(s_commandsNotAllowedInConnectingMode);
}
- protected AgentAttache(AgentManagerImpl agentMgr, final long id, final String name, boolean maintenance) {
+ protected AgentAttache(final AgentManagerImpl agentMgr, final long id, final String name, final boolean maintenance) {
_id = id;
_name = name;
_waitForList = new ConcurrentHashMap<Long, Listener>();
@@ -180,13 +179,13 @@ public abstract class AgentAttache {
}
}
- protected synchronized void addRequest(Request req) {
+ protected synchronized void addRequest(final Request req) {
int index = findRequest(req);
assert (index < 0) : "How can we get index again? " + index + ":" + req.toString();
_requests.add(-index - 1, req);
}
- protected void cancel(Request req) {
+ protected void cancel(final Request req) {
long seq = req.getSequence();
cancel(seq);
}
@@ -205,11 +204,11 @@ public abstract class AgentAttache {
}
}
- protected synchronized int findRequest(Request req) {
+ protected synchronized int findRequest(final Request req) {
return Collections.binarySearch(_requests, req, s_reqComparator);
}
- protected synchronized int findRequest(long seq) {
+ protected synchronized int findRequest(final long seq) {
return Collections.binarySearch(_requests, seq, s_seqComparator);
}
@@ -331,17 +330,20 @@ public abstract class AgentAttache {
}
@Override
- public boolean equals(Object obj) {
- try {
- AgentAttache that = (AgentAttache)obj;
- return _id == that._id;
- } catch (ClassCastException e) {
- assert false : "Who's sending an " + obj.getClass().getSimpleName() + " to AgentAttache.equals()? ";
+ public boolean equals(final Object obj) {
+ // Return false straight away.
+ if (obj == null) {
+ return false;
+ }
+ // No need to handle a ClassCastException. If the classes are different, then equals can return false straight ahead.
+ if (this.getClass() != obj.getClass()) {
return false;
}
+ AgentAttache that = (AgentAttache)obj;
+ return _id == that._id;
}
- public void send(Request req, final Listener listener) throws AgentUnavailableException {
+ public void send(final Request req, final Listener listener) throws AgentUnavailableException {
checkAvailability(req.getCommands());
long seq = req.getSequence();
@@ -387,7 +389,7 @@ public abstract class AgentAttache {
}
}
- public Answer[] send(Request req, int wait) throws AgentUnavailableException, OperationTimedoutException {
+ public Answer[] send(final Request req, final int wait) throws AgentUnavailableException, OperationTimedoutException {
SynchronousListener sl = new SynchronousListener(null);
long seq = req.getSequence();
@@ -478,7 +480,7 @@ public abstract class AgentAttache {
_currentSequence = req.getSequence();
}
- public void process(Answer[] answers) {
+ public void process(final Answer[] answers) {
//do nothing
}
@@ -505,7 +507,7 @@ public abstract class AgentAttache {
protected class Alarm extends ManagedContextRunnable {
long _seq;
- public Alarm(long seq) {
+ public Alarm(final long seq) {
_seq = seq;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a7e4103/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java
index 23c3f76..306c47f 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentAttache.java
@@ -42,17 +42,17 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
protected final LinkedList<Request> _transferRequests;
protected boolean _transferMode = false;
- static public void initialize(ClusteredAgentManagerImpl agentMgr) {
+ static public void initialize(final ClusteredAgentManagerImpl agentMgr) {
s_clusteredAgentMgr = agentMgr;
}
- public ClusteredAgentAttache(AgentManagerImpl agentMgr, long id, String name) {
+ public ClusteredAgentAttache(final AgentManagerImpl agentMgr, final long id, final String name) {
super(agentMgr, id, name, null, false);
_forward = true;
_transferRequests = new LinkedList<Request>();
}
- public ClusteredAgentAttache(AgentManagerImpl agentMgr, long id, String name, Link link, boolean maintenance) {
+ public ClusteredAgentAttache(final AgentManagerImpl agentMgr, final long id, final String name, final Link link, final boolean maintenance) {
super(agentMgr, id, name, link, maintenance);
_forward = link == null;
_transferRequests = new LinkedList<Request>();
@@ -84,7 +84,7 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
}
@Override
- public void cancel(long seq) {
+ public void cancel(final long seq) {
if (forForward()) {
Listener listener = getListener(seq);
if (listener != null && listener instanceof SynchronousListener) {
@@ -106,7 +106,7 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
}
@Override
- public void routeToAgent(byte[] data) throws AgentUnavailableException {
+ public void routeToAgent(final byte[] data) throws AgentUnavailableException {
if (s_logger.isDebugEnabled()) {
s_logger.debug(log(Request.getSequence(data), "Routing from " + Request.getManagementServerId(data)));
}
@@ -136,7 +136,7 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
}
@Override
- public void send(Request req, Listener listener) throws AgentUnavailableException {
+ public void send(final Request req, final Listener listener) throws AgentUnavailableException {
if (_link != null) {
super.send(req, listener);
return;
@@ -220,7 +220,7 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
_transferMode = transfer;
}
- public boolean getTransferMode() {
+ public synchronized boolean getTransferMode() {
return _transferMode;
}
@@ -232,13 +232,13 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
}
}
- protected synchronized void addRequestToTransfer(Request req) {
+ protected synchronized void addRequestToTransfer(final Request req) {
int index = findTransferRequest(req);
assert (index < 0) : "How can we get index again? " + index + ":" + req.toString();
_transferRequests.add(-index - 1, req);
}
- protected synchronized int findTransferRequest(Request req) {
+ protected synchronized int findTransferRequest(final Request req) {
return Collections.binarySearch(_transferRequests, req, s_reqComparator);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a7e4103/engine/orchestration/src/com/cloud/agent/manager/ConnectedAgentAttache.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/ConnectedAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/ConnectedAgentAttache.java
index 00d54bb..f11a105 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/ConnectedAgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/ConnectedAgentAttache.java
@@ -33,13 +33,13 @@ public class ConnectedAgentAttache extends AgentAttache {
protected Link _link;
- public ConnectedAgentAttache(AgentManagerImpl agentMgr, final long id, final String name, final Link link, boolean maintenance) {
+ public ConnectedAgentAttache(final AgentManagerImpl agentMgr, final long id, final String name, final Link link, final boolean maintenance) {
super(agentMgr, id, name, maintenance);
_link = link;
}
@Override
- public synchronized void send(Request req) throws AgentUnavailableException {
+ public synchronized void send(final Request req) throws AgentUnavailableException {
try {
_link.send(req.toBytes());
} catch (ClosedChannelException e) {
@@ -67,14 +67,31 @@ public class ConnectedAgentAttache extends AgentAttache {
}
@Override
- public boolean equals(Object obj) {
- try {
- ConnectedAgentAttache that = (ConnectedAgentAttache)obj;
- return super.equals(obj) && _link == that._link && _link != null;
- } catch (ClassCastException e) {
- assert false : "Who's sending an " + obj.getClass().getSimpleName() + " to " + this.getClass().getSimpleName() + ".equals()? ";
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((_link == null) ? 0 : _link.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ // Return false straight away.
+ if (obj == null) {
+ return false;
+ }
+ // No need to handle a ClassCastException. If the classes are different, then equals can return false straight ahead.
+ if (this.getClass() != obj.getClass()) {
+ return false;
+ }
+ // This should not be part of the equals() method, but I'm keeping it because it is expected behaviour based
+ // on the previous implementation. The link attribute of the other object should be checked here as well
+ // to verify if it's not null whilst the this is null.
+ if (_link == null) {
return false;
}
+ ConnectedAgentAttache that = (ConnectedAgentAttache)obj;
+ return super.equals(obj) && _link == that._link;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a7e4103/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java
index 86eab58..51e8766 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java
@@ -25,9 +25,6 @@ import java.util.Map;
import javax.inject.Inject;
import javax.ws.rs.Path;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceManager;
@@ -38,6 +35,8 @@ import org.apache.cloudstack.engine.datacenter.entity.api.PodEntityImpl;
import org.apache.cloudstack.engine.datacenter.entity.api.StorageEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntityImpl;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
import com.cloud.host.Host;
import com.cloud.host.Status;
@@ -52,13 +51,13 @@ public class ProvisioningServiceImpl implements ProvisioningService {
DataCenterResourceManager manager;
@Override
- public StorageEntity registerStorage(String name, List<String> tags, Map<String, String> details) {
+ public StorageEntity registerStorage(final String name, final List<String> tags, final Map<String, String> details) {
// TODO Auto-generated method stub
return null;
}
@Override
- public ZoneEntity registerZone(String zoneUuid, String name, String owner, List<String> tags, Map<String, String> details) {
+ public ZoneEntity registerZone(final String zoneUuid, final String name, final String owner, final List<String> tags, final Map<String, String> details) {
ZoneEntityImpl zoneEntity = new ZoneEntityImpl(zoneUuid, manager);
zoneEntity.setName(name);
zoneEntity.setOwner(owner);
@@ -68,7 +67,7 @@ public class ProvisioningServiceImpl implements ProvisioningService {
}
@Override
- public PodEntity registerPod(String podUuid, String name, String owner, String zoneUuid, List<String> tags, Map<String, String> details) {
+ public PodEntity registerPod(final String podUuid, final String name, final String owner, final String zoneUuid, final List<String> tags, final Map<String, String> details) {
PodEntityImpl podEntity = new PodEntityImpl(podUuid, manager);
podEntity.setOwner(owner);
podEntity.setName(name);
@@ -77,7 +76,7 @@ public class ProvisioningServiceImpl implements ProvisioningService {
}
@Override
- public ClusterEntity registerCluster(String clusterUuid, String name, String owner, List<String> tags, Map<String, String> details) {
+ public ClusterEntity registerCluster(final String clusterUuid, final String name, final String owner, final List<String> tags, final Map<String, String> details) {
ClusterEntityImpl clusterEntity = new ClusterEntityImpl(clusterUuid, manager);
clusterEntity.setOwner(owner);
clusterEntity.setName(name);
@@ -86,7 +85,7 @@ public class ProvisioningServiceImpl implements ProvisioningService {
}
@Override
- public HostEntity registerHost(String hostUuid, String name, String owner, List<String> tags, Map<String, String> details) {
+ public HostEntity registerHost(final String hostUuid, final String name, final String owner, final List<String> tags, final Map<String, String> details) {
HostEntityImpl hostEntity = new HostEntityImpl(hostUuid, manager);
hostEntity.setOwner(owner);
hostEntity.setName(name);
@@ -97,38 +96,38 @@ public class ProvisioningServiceImpl implements ProvisioningService {
}
@Override
- public void deregisterStorage(String uuid) {
+ public void deregisterStorage(final String uuid) {
// TODO Auto-generated method stub
}
@Override
- public void deregisterZone(String uuid) {
+ public void deregisterZone(final String uuid) {
ZoneEntityImpl zoneEntity = new ZoneEntityImpl(uuid, manager);
zoneEntity.disable();
}
@Override
- public void deregisterPod(String uuid) {
+ public void deregisterPod(final String uuid) {
PodEntityImpl podEntity = new PodEntityImpl(uuid, manager);
podEntity.disable();
}
@Override
- public void deregisterCluster(String uuid) {
+ public void deregisterCluster(final String uuid) {
ClusterEntityImpl clusterEntity = new ClusterEntityImpl(uuid, manager);
clusterEntity.disable();
}
@Override
- public void deregisterHost(String uuid) {
+ public void deregisterHost(final String uuid) {
HostEntityImpl hostEntity = new HostEntityImpl(uuid, manager);
hostEntity.disable();
}
@Override
- public void changeState(String type, String entity, Status state) {
+ public void changeState(final String type, final String entity, final Status state) {
// TODO Auto-generated method stub
}
@@ -141,7 +140,10 @@ public class ProvisioningServiceImpl implements ProvisioningService {
@Override
public List<PodEntity> listPods() {
- List<PodEntity> pods = new ArrayList<PodEntity>();
+ /*
+ * Not in use now, just commented out.
+ */
+ //List<PodEntity> pods = new ArrayList<PodEntity>();
//pods.add(new PodEntityImpl("pod-uuid-1", "pod1"));
//pods.add(new PodEntityImpl("pod-uuid-2", "pod2"));
return null;
@@ -162,7 +164,7 @@ public class ProvisioningServiceImpl implements ProvisioningService {
}
@Override
- public ZoneEntity getZone(String uuid) {
+ public ZoneEntity getZone(final String uuid) {
ZoneEntityImpl impl = new ZoneEntityImpl(uuid, manager);
return impl;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a7e4103/engine/orchestration/test/com/cloud/agent/manager/ConnectedAgentAttacheTest.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/test/com/cloud/agent/manager/ConnectedAgentAttacheTest.java b/engine/orchestration/test/com/cloud/agent/manager/ConnectedAgentAttacheTest.java
new file mode 100644
index 0000000..e0e97c5
--- /dev/null
+++ b/engine/orchestration/test/com/cloud/agent/manager/ConnectedAgentAttacheTest.java
@@ -0,0 +1,82 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.agent.manager;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+
+import com.cloud.utils.nio.Link;
+
+public class ConnectedAgentAttacheTest {
+
+ @Test
+ public void testEquals() throws Exception {
+
+ Link link = mock(Link.class);
+
+ ConnectedAgentAttache agentAttache1 = new ConnectedAgentAttache(null, 0, null, link, false);
+ ConnectedAgentAttache agentAttache2 = new ConnectedAgentAttache(null, 0, null, link, false);
+
+ assertTrue(agentAttache1.equals(agentAttache2));
+ }
+
+ @Test
+ public void testEqualsFalseNull() throws Exception {
+
+ Link link = mock(Link.class);
+
+ ConnectedAgentAttache agentAttache1 = new ConnectedAgentAttache(null, 0, null, link, false);
+
+ assertFalse(agentAttache1.equals(null));
+ }
+
+ @Test
+ public void testEqualsFalseDiffLink() throws Exception {
+
+ Link link1 = mock(Link.class);
+ Link link2 = mock(Link.class);
+
+ ConnectedAgentAttache agentAttache1 = new ConnectedAgentAttache(null, 0, null, link1, false);
+ ConnectedAgentAttache agentAttache2 = new ConnectedAgentAttache(null, 0, null, link2, false);
+
+ assertFalse(agentAttache1.equals(agentAttache2));
+ }
+
+ @Test
+ public void testEqualsFalseDiffId() throws Exception {
+
+ Link link1 = mock(Link.class);
+
+ ConnectedAgentAttache agentAttache1 = new ConnectedAgentAttache(null, 1, null, link1, false);
+ ConnectedAgentAttache agentAttache2 = new ConnectedAgentAttache(null, 2, null, link1, false);
+
+ assertFalse(agentAttache1.equals(agentAttache2));
+ }
+
+ @Test
+ public void testEqualsFalseDiffClass() throws Exception {
+
+ Link link1 = mock(Link.class);
+
+ ConnectedAgentAttache agentAttache1 = new ConnectedAgentAttache(null, 1, null, link1, false);
+
+ assertFalse(agentAttache1.equals("abc"));
+ }
+}
\ No newline at end of file
[41/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
- Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging
Signed-off-by: Daan Hoogland <da...@onecht.net>
(cherry picked from commit df270d6387c362b960064ee5123c14782e767a19)
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b0c6d473
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b0c6d473
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b0c6d473
Branch: refs/heads/acl-item-cidrs
Commit: b0c6d4734724358df97b6fa4d8c5beb0f447745e
Parents: f05fb9f
Author: Mandar Barve <ma...@sungard.com>
Authored: Mon Feb 24 14:26:32 2014 +0000
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Feb 25 22:59:10 2014 +0100
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/APICommand.java | 4 ++++
.../api/command/admin/account/CreateAccountCmd.java | 3 ++-
.../api/command/admin/account/DeleteAccountCmd.java | 3 ++-
.../api/command/admin/account/DisableAccountCmd.java | 3 ++-
.../api/command/admin/account/EnableAccountCmd.java | 3 ++-
.../api/command/admin/account/LockAccountCmd.java | 3 ++-
.../api/command/admin/account/UpdateAccountCmd.java | 3 ++-
.../api/command/admin/alert/GenerateAlertCmd.java | 3 ++-
.../api/command/admin/autoscale/CreateCounterCmd.java | 3 ++-
.../api/command/admin/autoscale/DeleteCounterCmd.java | 3 ++-
.../api/command/admin/cluster/AddClusterCmd.java | 3 ++-
.../api/command/admin/cluster/DeleteClusterCmd.java | 3 ++-
.../api/command/admin/cluster/ListClustersCmd.java | 3 ++-
.../api/command/admin/cluster/UpdateClusterCmd.java | 3 ++-
.../api/command/admin/config/ListCfgsByCmd.java | 3 ++-
.../command/admin/config/ListDeploymentPlannersCmd.java | 3 ++-
.../admin/config/ListHypervisorCapabilitiesCmd.java | 4 +++-
.../api/command/admin/config/UpdateCfgCmd.java | 3 ++-
.../admin/config/UpdateHypervisorCapabilitiesCmd.java | 4 +++-
.../api/command/admin/domain/CreateDomainCmd.java | 3 ++-
.../api/command/admin/domain/DeleteDomainCmd.java | 3 ++-
.../api/command/admin/domain/ListDomainChildrenCmd.java | 3 ++-
.../api/command/admin/domain/ListDomainsCmd.java | 3 ++-
.../api/command/admin/domain/UpdateDomainCmd.java | 3 ++-
.../cloudstack/api/command/admin/host/AddHostCmd.java | 3 ++-
.../api/command/admin/host/AddSecondaryStorageCmd.java | 3 ++-
.../api/command/admin/host/CancelMaintenanceCmd.java | 3 ++-
.../cloudstack/api/command/admin/host/DeleteHostCmd.java | 3 ++-
.../api/command/admin/host/FindHostsForMigrationCmd.java | 3 ++-
.../cloudstack/api/command/admin/host/ListHostsCmd.java | 3 ++-
.../api/command/admin/host/PrepareForMaintenanceCmd.java | 3 ++-
.../api/command/admin/host/ReconnectHostCmd.java | 3 ++-
.../command/admin/host/ReleaseHostReservationCmd.java | 3 ++-
.../cloudstack/api/command/admin/host/UpdateHostCmd.java | 3 ++-
.../api/command/admin/host/UpdateHostPasswordCmd.java | 3 ++-
.../ConfigureInternalLoadBalancerElementCmd.java | 4 +++-
.../internallb/CreateInternalLoadBalancerElementCmd.java | 4 +++-
.../command/admin/internallb/ListInternalLBVMsCmd.java | 3 ++-
.../internallb/ListInternalLoadBalancerElementsCmd.java | 4 +++-
.../command/admin/internallb/StartInternalLBVMCmd.java | 3 ++-
.../command/admin/internallb/StopInternalLBVMCmd.java | 3 ++-
.../api/command/admin/network/AddNetworkDeviceCmd.java | 3 ++-
.../admin/network/AddNetworkServiceProviderCmd.java | 4 +++-
.../command/admin/network/CreateNetworkOfferingCmd.java | 3 ++-
.../command/admin/network/CreatePhysicalNetworkCmd.java | 3 ++-
.../admin/network/CreateStorageNetworkIpRangeCmd.java | 4 +++-
.../command/admin/network/DedicateGuestVlanRangeCmd.java | 3 ++-
.../command/admin/network/DeleteNetworkDeviceCmd.java | 3 ++-
.../command/admin/network/DeleteNetworkOfferingCmd.java | 3 ++-
.../admin/network/DeleteNetworkServiceProviderCmd.java | 3 ++-
.../command/admin/network/DeletePhysicalNetworkCmd.java | 3 ++-
.../admin/network/DeleteStorageNetworkIpRangeCmd.java | 3 ++-
.../admin/network/ListDedicatedGuestVlanRangesCmd.java | 3 ++-
.../api/command/admin/network/ListNetworkDeviceCmd.java | 3 ++-
.../admin/network/ListNetworkIsolationMethodsCmd.java | 4 +++-
.../admin/network/ListNetworkServiceProvidersCmd.java | 4 +++-
.../command/admin/network/ListPhysicalNetworksCmd.java | 3 ++-
.../admin/network/ListStorageNetworkIpRangeCmd.java | 3 ++-
.../admin/network/ListSupportedNetworkServicesCmd.java | 4 +++-
.../admin/network/ReleaseDedicatedGuestVlanRangeCmd.java | 3 ++-
.../command/admin/network/UpdateNetworkOfferingCmd.java | 3 ++-
.../admin/network/UpdateNetworkServiceProviderCmd.java | 4 +++-
.../command/admin/network/UpdatePhysicalNetworkCmd.java | 3 ++-
.../admin/network/UpdateStorageNetworkIpRangeCmd.java | 4 +++-
.../command/admin/offering/CreateDiskOfferingCmd.java | 3 ++-
.../command/admin/offering/CreateServiceOfferingCmd.java | 3 ++-
.../command/admin/offering/DeleteDiskOfferingCmd.java | 3 ++-
.../command/admin/offering/DeleteServiceOfferingCmd.java | 3 ++-
.../command/admin/offering/UpdateDiskOfferingCmd.java | 3 ++-
.../command/admin/offering/UpdateServiceOfferingCmd.java | 3 ++-
.../cloudstack/api/command/admin/pod/CreatePodCmd.java | 3 ++-
.../cloudstack/api/command/admin/pod/DeletePodCmd.java | 3 ++-
.../cloudstack/api/command/admin/pod/ListPodsByCmd.java | 3 ++-
.../cloudstack/api/command/admin/pod/UpdatePodCmd.java | 3 ++-
.../api/command/admin/region/AddRegionCmd.java | 3 ++-
.../command/admin/region/CreatePortableIpRangeCmd.java | 4 +++-
.../command/admin/region/DeletePortableIpRangeCmd.java | 3 ++-
.../command/admin/region/ListPortableIpRangesCmd.java | 3 ++-
.../api/command/admin/region/RemoveRegionCmd.java | 3 ++-
.../api/command/admin/region/UpdateRegionCmd.java | 3 ++-
.../api/command/admin/resource/ArchiveAlertsCmd.java | 3 ++-
.../command/admin/resource/CleanVMReservationsCmd.java | 3 ++-
.../api/command/admin/resource/DeleteAlertsCmd.java | 3 ++-
.../api/command/admin/resource/ListAlertsCmd.java | 3 ++-
.../api/command/admin/resource/ListCapacityCmd.java | 3 ++-
.../admin/resource/UploadCustomCertificateCmd.java | 3 ++-
.../api/command/admin/router/ConfigureOvsElementCmd.java | 3 ++-
.../admin/router/ConfigureVirtualRouterElementCmd.java | 3 ++-
.../admin/router/CreateVirtualRouterElementCmd.java | 3 ++-
.../api/command/admin/router/DestroyRouterCmd.java | 3 ++-
.../api/command/admin/router/ListOvsElementsCmd.java | 3 ++-
.../api/command/admin/router/ListRoutersCmd.java | 3 ++-
.../admin/router/ListVirtualRouterElementsCmd.java | 3 ++-
.../api/command/admin/router/RebootRouterCmd.java | 3 ++-
.../api/command/admin/router/StartRouterCmd.java | 3 ++-
.../api/command/admin/router/StopRouterCmd.java | 3 ++-
.../api/command/admin/router/UpgradeRouterCmd.java | 3 ++-
.../command/admin/router/UpgradeRouterTemplateCmd.java | 3 ++-
.../api/command/admin/storage/AddImageStoreCmd.java | 3 ++-
.../cloudstack/api/command/admin/storage/AddS3Cmd.java | 3 ++-
.../storage/CancelPrimaryStorageMaintenanceCmd.java | 3 ++-
.../admin/storage/CreateSecondaryStagingStoreCmd.java | 3 ++-
.../api/command/admin/storage/CreateStoragePoolCmd.java | 3 ++-
.../api/command/admin/storage/DeleteImageStoreCmd.java | 3 ++-
.../api/command/admin/storage/DeletePoolCmd.java | 3 ++-
.../admin/storage/DeleteSecondaryStagingStoreCmd.java | 3 ++-
.../admin/storage/FindStoragePoolsForMigrationCmd.java | 3 ++-
.../api/command/admin/storage/ListImageStoresCmd.java | 3 ++-
.../cloudstack/api/command/admin/storage/ListS3sCmd.java | 3 ++-
.../admin/storage/ListSecondaryStagingStoresCmd.java | 3 ++-
.../api/command/admin/storage/ListStoragePoolsCmd.java | 3 ++-
.../command/admin/storage/ListStorageProvidersCmd.java | 3 ++-
.../storage/PreparePrimaryStorageForMaintenanceCmd.java | 3 ++-
.../admin/storage/UpdateCloudToUseObjectStoreCmd.java | 3 ++-
.../api/command/admin/storage/UpdateStoragePoolCmd.java | 3 ++-
.../cloudstack/api/command/admin/swift/AddSwiftCmd.java | 3 ++-
.../api/command/admin/swift/ListSwiftsCmd.java | 3 ++-
.../api/command/admin/systemvm/DestroySystemVmCmd.java | 3 ++-
.../api/command/admin/systemvm/ListSystemVMsCmd.java | 3 ++-
.../api/command/admin/systemvm/MigrateSystemVMCmd.java | 3 ++-
.../api/command/admin/systemvm/RebootSystemVmCmd.java | 3 ++-
.../api/command/admin/systemvm/ScaleSystemVMCmd.java | 3 ++-
.../api/command/admin/systemvm/StartSystemVMCmd.java | 3 ++-
.../api/command/admin/systemvm/StopSystemVmCmd.java | 3 ++-
.../api/command/admin/systemvm/UpgradeSystemVMCmd.java | 5 +++--
.../api/command/admin/template/PrepareTemplateCmd.java | 3 ++-
.../api/command/admin/usage/AddTrafficMonitorCmd.java | 3 ++-
.../api/command/admin/usage/AddTrafficTypeCmd.java | 3 ++-
.../api/command/admin/usage/DeleteTrafficMonitorCmd.java | 3 ++-
.../api/command/admin/usage/DeleteTrafficTypeCmd.java | 3 ++-
.../api/command/admin/usage/GenerateUsageRecordsCmd.java | 4 +++-
.../api/command/admin/usage/GetUsageRecordsCmd.java | 3 ++-
.../api/command/admin/usage/ListTrafficMonitorsCmd.java | 3 ++-
.../admin/usage/ListTrafficTypeImplementorsCmd.java | 4 +++-
.../api/command/admin/usage/ListTrafficTypesCmd.java | 3 ++-
.../api/command/admin/usage/ListUsageTypesCmd.java | 3 ++-
.../api/command/admin/usage/UpdateTrafficTypeCmd.java | 3 ++-
.../cloudstack/api/command/admin/user/CreateUserCmd.java | 3 ++-
.../cloudstack/api/command/admin/user/DeleteUserCmd.java | 3 ++-
.../api/command/admin/user/DisableUserCmd.java | 3 ++-
.../cloudstack/api/command/admin/user/EnableUserCmd.java | 3 ++-
.../cloudstack/api/command/admin/user/GetUserCmd.java | 3 ++-
.../cloudstack/api/command/admin/user/ListUsersCmd.java | 3 ++-
.../cloudstack/api/command/admin/user/LockUserCmd.java | 3 ++-
.../cloudstack/api/command/admin/user/RegisterCmd.java | 3 ++-
.../cloudstack/api/command/admin/user/UpdateUserCmd.java | 3 ++-
.../api/command/admin/vlan/CreateVlanIpRangeCmd.java | 3 ++-
.../api/command/admin/vlan/DedicatePublicIpRangeCmd.java | 3 ++-
.../api/command/admin/vlan/DeleteVlanIpRangeCmd.java | 3 ++-
.../api/command/admin/vlan/ListVlanIpRangesCmd.java | 3 ++-
.../api/command/admin/vlan/ReleasePublicIpRangeCmd.java | 3 ++-
.../cloudstack/api/command/admin/vm/AssignVMCmd.java | 4 +++-
.../cloudstack/api/command/admin/vm/ExpungeVMCmd.java | 3 ++-
.../api/command/admin/vm/GetVMUserDataCmd.java | 3 ++-
.../cloudstack/api/command/admin/vm/MigrateVMCmd.java | 4 +++-
.../admin/vm/MigrateVirtualMachineWithVolumeCmd.java | 4 +++-
.../cloudstack/api/command/admin/vm/RecoverVMCmd.java | 3 ++-
.../api/command/admin/vpc/CreatePrivateGatewayCmd.java | 3 ++-
.../api/command/admin/vpc/CreateVPCOfferingCmd.java | 3 ++-
.../api/command/admin/vpc/DeletePrivateGatewayCmd.java | 3 ++-
.../api/command/admin/vpc/DeleteVPCOfferingCmd.java | 3 ++-
.../api/command/admin/vpc/UpdateVPCOfferingCmd.java | 3 ++-
.../cloudstack/api/command/admin/zone/CreateZoneCmd.java | 3 ++-
.../cloudstack/api/command/admin/zone/DeleteZoneCmd.java | 3 ++-
.../command/admin/zone/MarkDefaultZoneForAccountCmd.java | 3 ++-
.../cloudstack/api/command/admin/zone/UpdateZoneCmd.java | 3 ++-
.../api/command/user/account/AddAccountToProjectCmd.java | 3 ++-
.../user/account/DeleteAccountFromProjectCmd.java | 3 ++-
.../api/command/user/account/ListAccountsCmd.java | 3 ++-
.../api/command/user/account/ListProjectAccountsCmd.java | 3 ++-
.../api/command/user/address/AssociateIPAddrCmd.java | 3 ++-
.../api/command/user/address/DisassociateIPAddrCmd.java | 3 ++-
.../command/user/address/ListPublicIpAddressesCmd.java | 3 ++-
.../api/command/user/address/UpdateIPAddrCmd.java | 3 ++-
.../user/affinitygroup/CreateAffinityGroupCmd.java | 3 ++-
.../user/affinitygroup/DeleteAffinityGroupCmd.java | 3 ++-
.../user/affinitygroup/ListAffinityGroupTypesCmd.java | 3 ++-
.../user/affinitygroup/ListAffinityGroupsCmd.java | 3 ++-
.../user/affinitygroup/UpdateVMAffinityGroupCmd.java | 4 +++-
.../command/user/autoscale/CreateAutoScalePolicyCmd.java | 4 +++-
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 4 +++-
.../user/autoscale/CreateAutoScaleVmProfileCmd.java | 4 +++-
.../api/command/user/autoscale/CreateConditionCmd.java | 3 ++-
.../command/user/autoscale/DeleteAutoScalePolicyCmd.java | 3 ++-
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 3 ++-
.../user/autoscale/DeleteAutoScaleVmProfileCmd.java | 3 ++-
.../api/command/user/autoscale/DeleteConditionCmd.java | 3 ++-
.../user/autoscale/DisableAutoScaleVmGroupCmd.java | 3 ++-
.../user/autoscale/EnableAutoScaleVmGroupCmd.java | 3 ++-
.../command/user/autoscale/ListAutoScalePoliciesCmd.java | 3 ++-
.../command/user/autoscale/ListAutoScaleVmGroupsCmd.java | 3 ++-
.../user/autoscale/ListAutoScaleVmProfilesCmd.java | 3 ++-
.../api/command/user/autoscale/ListConditionsCmd.java | 3 ++-
.../api/command/user/autoscale/ListCountersCmd.java | 3 ++-
.../command/user/autoscale/UpdateAutoScalePolicyCmd.java | 3 ++-
.../user/autoscale/UpdateAutoScaleVmGroupCmd.java | 3 ++-
.../user/autoscale/UpdateAutoScaleVmProfileCmd.java | 3 ++-
.../api/command/user/config/ListCapabilitiesCmd.java | 3 ++-
.../api/command/user/event/ArchiveEventsCmd.java | 3 ++-
.../api/command/user/event/DeleteEventsCmd.java | 3 ++-
.../api/command/user/event/ListEventTypesCmd.java | 3 ++-
.../cloudstack/api/command/user/event/ListEventsCmd.java | 3 ++-
.../user/firewall/CreateEgressFirewallRuleCmd.java | 3 ++-
.../api/command/user/firewall/CreateFirewallRuleCmd.java | 3 ++-
.../user/firewall/CreatePortForwardingRuleCmd.java | 3 ++-
.../user/firewall/DeleteEgressFirewallRuleCmd.java | 3 ++-
.../api/command/user/firewall/DeleteFirewallRuleCmd.java | 3 ++-
.../user/firewall/DeletePortForwardingRuleCmd.java | 3 ++-
.../user/firewall/ListEgressFirewallRulesCmd.java | 3 ++-
.../api/command/user/firewall/ListFirewallRulesCmd.java | 3 ++-
.../user/firewall/ListPortForwardingRulesCmd.java | 3 ++-
.../user/firewall/UpdateEgressFirewallRuleCmd.java | 3 ++-
.../api/command/user/firewall/UpdateFirewallRuleCmd.java | 3 ++-
.../user/firewall/UpdatePortForwardingRuleCmd.java | 3 ++-
.../api/command/user/guest/ListGuestOsCategoriesCmd.java | 3 ++-
.../api/command/user/guest/ListGuestOsCmd.java | 3 ++-
.../cloudstack/api/command/user/iso/AttachIsoCmd.java | 3 ++-
.../cloudstack/api/command/user/iso/CopyIsoCmd.java | 3 ++-
.../cloudstack/api/command/user/iso/DeleteIsoCmd.java | 3 ++-
.../cloudstack/api/command/user/iso/DetachIsoCmd.java | 3 ++-
.../cloudstack/api/command/user/iso/ExtractIsoCmd.java | 3 ++-
.../api/command/user/iso/ListIsoPermissionsCmd.java | 4 +++-
.../cloudstack/api/command/user/iso/ListIsosCmd.java | 3 ++-
.../cloudstack/api/command/user/iso/RegisterIsoCmd.java | 3 ++-
.../cloudstack/api/command/user/iso/UpdateIsoCmd.java | 3 ++-
.../api/command/user/iso/UpdateIsoPermissionsCmd.java | 3 ++-
.../api/command/user/job/ListAsyncJobsCmd.java | 3 ++-
.../api/command/user/job/QueryAsyncJobResultCmd.java | 3 ++-
.../user/loadbalancer/AssignCertToLoadBalancerCmd.java | 3 ++-
.../user/loadbalancer/AssignToLoadBalancerRuleCmd.java | 4 +++-
.../loadbalancer/CreateApplicationLoadBalancerCmd.java | 3 ++-
.../user/loadbalancer/CreateLBHealthCheckPolicyCmd.java | 4 +++-
.../user/loadbalancer/CreateLBStickinessPolicyCmd.java | 3 ++-
.../user/loadbalancer/CreateLoadBalancerRuleCmd.java | 3 ++-
.../loadbalancer/DeleteApplicationLoadBalancerCmd.java | 3 ++-
.../user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java | 3 ++-
.../user/loadbalancer/DeleteLBStickinessPolicyCmd.java | 3 ++-
.../user/loadbalancer/DeleteLoadBalancerRuleCmd.java | 3 ++-
.../api/command/user/loadbalancer/DeleteSslCertCmd.java | 3 ++-
.../loadbalancer/ListApplicationLoadBalancersCmd.java | 3 ++-
.../user/loadbalancer/ListLBHealthCheckPoliciesCmd.java | 3 ++-
.../user/loadbalancer/ListLBStickinessPoliciesCmd.java | 3 ++-
.../loadbalancer/ListLoadBalancerRuleInstancesCmd.java | 4 +++-
.../user/loadbalancer/ListLoadBalancerRulesCmd.java | 3 ++-
.../api/command/user/loadbalancer/ListSslCertsCmd.java | 3 ++-
.../user/loadbalancer/RemoveCertFromLoadBalancerCmd.java | 3 ++-
.../user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java | 4 +++-
.../loadbalancer/UpdateApplicationLoadBalancerCmd.java | 3 ++-
.../user/loadbalancer/UpdateLoadBalancerRuleCmd.java | 3 ++-
.../api/command/user/loadbalancer/UploadSslCertCmd.java | 3 ++-
.../api/command/user/nat/CreateIpForwardingRuleCmd.java | 3 ++-
.../api/command/user/nat/DeleteIpForwardingRuleCmd.java | 3 ++-
.../api/command/user/nat/DisableStaticNatCmd.java | 3 ++-
.../api/command/user/nat/EnableStaticNatCmd.java | 3 ++-
.../api/command/user/nat/ListIpForwardingRulesCmd.java | 3 ++-
.../api/command/user/network/CreateNetworkACLCmd.java | 4 +++-
.../command/user/network/CreateNetworkACLListCmd.java | 3 ++-
.../api/command/user/network/CreateNetworkCmd.java | 3 ++-
.../api/command/user/network/DeleteNetworkACLCmd.java | 3 ++-
.../command/user/network/DeleteNetworkACLListCmd.java | 3 ++-
.../api/command/user/network/DeleteNetworkCmd.java | 3 ++-
.../api/command/user/network/ListNetworkACLListsCmd.java | 3 ++-
.../api/command/user/network/ListNetworkACLsCmd.java | 3 ++-
.../command/user/network/ListNetworkOfferingsCmd.java | 3 ++-
.../api/command/user/network/ListNetworksCmd.java | 3 ++-
.../command/user/network/ReplaceNetworkACLListCmd.java | 3 ++-
.../api/command/user/network/RestartNetworkCmd.java | 4 +++-
.../command/user/network/UpdateNetworkACLItemCmd.java | 3 ++-
.../command/user/network/UpdateNetworkACLListCmd.java | 3 ++-
.../api/command/user/network/UpdateNetworkCmd.java | 3 ++-
.../api/command/user/offering/ListDiskOfferingsCmd.java | 3 ++-
.../command/user/offering/ListServiceOfferingsCmd.java | 3 ++-
.../api/command/user/project/ActivateProjectCmd.java | 3 ++-
.../api/command/user/project/CreateProjectCmd.java | 3 ++-
.../api/command/user/project/DeleteProjectCmd.java | 3 ++-
.../command/user/project/DeleteProjectInvitationCmd.java | 3 ++-
.../command/user/project/ListProjectInvitationsCmd.java | 4 +++-
.../api/command/user/project/ListProjectsCmd.java | 4 +++-
.../api/command/user/project/SuspendProjectCmd.java | 3 ++-
.../api/command/user/project/UpdateProjectCmd.java | 3 ++-
.../command/user/project/UpdateProjectInvitationCmd.java | 3 ++-
.../api/command/user/region/ListRegionsCmd.java | 3 ++-
.../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java | 4 +++-
.../region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 3 ++-
.../region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java | 3 ++-
.../region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java | 3 ++-
.../ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java | 4 +++-
.../region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java | 3 ++-
.../api/command/user/resource/GetCloudIdentifierCmd.java | 3 ++-
.../api/command/user/resource/ListHypervisorsCmd.java | 3 ++-
.../api/command/user/resource/ListResourceLimitsCmd.java | 3 ++-
.../command/user/resource/UpdateResourceCountCmd.java | 3 ++-
.../command/user/resource/UpdateResourceLimitCmd.java | 3 ++-
.../securitygroup/AuthorizeSecurityGroupEgressCmd.java | 4 +++-
.../securitygroup/AuthorizeSecurityGroupIngressCmd.java | 4 +++-
.../user/securitygroup/CreateSecurityGroupCmd.java | 3 ++-
.../user/securitygroup/DeleteSecurityGroupCmd.java | 3 ++-
.../user/securitygroup/ListSecurityGroupsCmd.java | 3 ++-
.../user/securitygroup/RevokeSecurityGroupEgressCmd.java | 4 +++-
.../securitygroup/RevokeSecurityGroupIngressCmd.java | 3 ++-
.../api/command/user/snapshot/CreateSnapshotCmd.java | 3 ++-
.../command/user/snapshot/CreateSnapshotPolicyCmd.java | 3 ++-
.../api/command/user/snapshot/DeleteSnapshotCmd.java | 3 ++-
.../command/user/snapshot/DeleteSnapshotPoliciesCmd.java | 3 ++-
.../command/user/snapshot/ListSnapshotPoliciesCmd.java | 3 ++-
.../api/command/user/snapshot/ListSnapshotsCmd.java | 3 ++-
.../api/command/user/snapshot/RevertSnapshotCmd.java | 3 ++-
.../api/command/user/ssh/CreateSSHKeyPairCmd.java | 3 ++-
.../api/command/user/ssh/DeleteSSHKeyPairCmd.java | 3 ++-
.../api/command/user/ssh/ListSSHKeyPairsCmd.java | 3 ++-
.../api/command/user/ssh/RegisterSSHKeyPairCmd.java | 3 ++-
.../cloudstack/api/command/user/tag/CreateTagsCmd.java | 3 ++-
.../cloudstack/api/command/user/tag/DeleteTagsCmd.java | 3 ++-
.../cloudstack/api/command/user/tag/ListTagsCmd.java | 3 ++-
.../api/command/user/template/CopyTemplateCmd.java | 3 ++-
.../api/command/user/template/CreateTemplateCmd.java | 3 ++-
.../api/command/user/template/DeleteTemplateCmd.java | 3 ++-
.../api/command/user/template/ExtractTemplateCmd.java | 3 ++-
.../user/template/ListTemplatePermissionsCmd.java | 4 +++-
.../api/command/user/template/ListTemplatesCmd.java | 3 ++-
.../api/command/user/template/RegisterTemplateCmd.java | 3 ++-
.../api/command/user/template/UpdateTemplateCmd.java | 3 ++-
.../user/template/UpdateTemplatePermissionsCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/AddIpToVmNicCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/AddNicToVMCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/DeployVMCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/DestroyVMCmd.java | 4 +++-
.../cloudstack/api/command/user/vm/GetVMPasswordCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/ListNicsCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/RebootVMCmd.java | 3 ++-
.../api/command/user/vm/RemoveIpFromVmNicCmd.java | 3 ++-
.../api/command/user/vm/RemoveNicFromVMCmd.java | 3 ++-
.../api/command/user/vm/ResetVMPasswordCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/RestoreVMCmd.java | 4 +++-
.../cloudstack/api/command/user/vm/ScaleVMCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/StartVMCmd.java | 3 ++-
.../apache/cloudstack/api/command/user/vm/StopVMCmd.java | 3 ++-
.../api/command/user/vm/UpdateDefaultNicForVMCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/UpdateVMCmd.java | 3 ++-
.../cloudstack/api/command/user/vm/UpgradeVMCmd.java | 3 ++-
.../api/command/user/vmgroup/CreateVMGroupCmd.java | 3 ++-
.../api/command/user/vmgroup/DeleteVMGroupCmd.java | 3 ++-
.../api/command/user/vmgroup/ListVMGroupsCmd.java | 3 ++-
.../api/command/user/vmgroup/UpdateVMGroupCmd.java | 3 ++-
.../api/command/user/vmsnapshot/CreateVMSnapshotCmd.java | 3 ++-
.../api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java | 3 ++-
.../api/command/user/vmsnapshot/ListVMSnapshotCmd.java | 3 ++-
.../command/user/vmsnapshot/RevertToVMSnapshotCmd.java | 3 ++-
.../api/command/user/volume/AddResourceDetailCmd.java | 3 ++-
.../api/command/user/volume/AttachVolumeCmd.java | 3 ++-
.../api/command/user/volume/CreateVolumeCmd.java | 3 ++-
.../api/command/user/volume/DeleteVolumeCmd.java | 3 ++-
.../api/command/user/volume/DetachVolumeCmd.java | 3 ++-
.../api/command/user/volume/ExtractVolumeCmd.java | 3 ++-
.../api/command/user/volume/ListResourceDetailsCmd.java | 3 ++-
.../api/command/user/volume/ListVolumesCmd.java | 3 ++-
.../api/command/user/volume/MigrateVolumeCmd.java | 3 ++-
.../api/command/user/volume/RemoveResourceDetailCmd.java | 3 ++-
.../api/command/user/volume/ResizeVolumeCmd.java | 3 ++-
.../api/command/user/volume/UpdateVolumeCmd.java | 3 ++-
.../api/command/user/volume/UploadVolumeCmd.java | 3 ++-
.../api/command/user/vpc/CreateStaticRouteCmd.java | 3 ++-
.../cloudstack/api/command/user/vpc/CreateVPCCmd.java | 3 ++-
.../api/command/user/vpc/DeleteStaticRouteCmd.java | 3 ++-
.../cloudstack/api/command/user/vpc/DeleteVPCCmd.java | 3 ++-
.../api/command/user/vpc/ListPrivateGatewaysCmd.java | 3 ++-
.../api/command/user/vpc/ListStaticRoutesCmd.java | 3 ++-
.../api/command/user/vpc/ListVPCOfferingsCmd.java | 3 ++-
.../cloudstack/api/command/user/vpc/ListVPCsCmd.java | 3 ++-
.../cloudstack/api/command/user/vpc/RestartVPCCmd.java | 3 ++-
.../cloudstack/api/command/user/vpc/UpdateVPCCmd.java | 3 ++-
.../cloudstack/api/command/user/vpn/AddVpnUserCmd.java | 3 ++-
.../api/command/user/vpn/CreateRemoteAccessVpnCmd.java | 3 ++-
.../api/command/user/vpn/CreateVpnConnectionCmd.java | 3 ++-
.../command/user/vpn/CreateVpnCustomerGatewayCmd.java | 3 ++-
.../api/command/user/vpn/CreateVpnGatewayCmd.java | 3 ++-
.../api/command/user/vpn/DeleteRemoteAccessVpnCmd.java | 3 ++-
.../api/command/user/vpn/DeleteVpnConnectionCmd.java | 3 ++-
.../command/user/vpn/DeleteVpnCustomerGatewayCmd.java | 3 ++-
.../api/command/user/vpn/DeleteVpnGatewayCmd.java | 3 ++-
.../api/command/user/vpn/ListRemoteAccessVpnsCmd.java | 3 ++-
.../api/command/user/vpn/ListVpnConnectionsCmd.java | 3 ++-
.../api/command/user/vpn/ListVpnCustomerGatewaysCmd.java | 3 ++-
.../api/command/user/vpn/ListVpnGatewaysCmd.java | 3 ++-
.../cloudstack/api/command/user/vpn/ListVpnUsersCmd.java | 3 ++-
.../api/command/user/vpn/RemoveVpnUserCmd.java | 3 ++-
.../api/command/user/vpn/ResetVpnConnectionCmd.java | 3 ++-
.../api/command/user/vpn/UpdateRemoteAccessVpnCmd.java | 3 ++-
.../api/command/user/vpn/UpdateVpnConnectionCmd.java | 3 ++-
.../command/user/vpn/UpdateVpnCustomerGatewayCmd.java | 3 ++-
.../api/command/user/vpn/UpdateVpnGatewayCmd.java | 3 ++-
.../cloudstack/api/command/user/zone/ListZonesByCmd.java | 3 ++-
.../api/command/user/discovery/ListApisCmd.java | 4 +++-
.../api/command/admin/ratelimit/ResetApiLimitCmd.java | 3 ++-
.../api/command/user/ratelimit/GetApiLimitCmd.java | 3 ++-
.../cloudstack/api/commands/DedicateClusterCmd.java | 3 ++-
.../apache/cloudstack/api/commands/DedicateHostCmd.java | 3 ++-
.../apache/cloudstack/api/commands/DedicatePodCmd.java | 3 ++-
.../apache/cloudstack/api/commands/DedicateZoneCmd.java | 3 ++-
.../api/commands/ListDedicatedClustersCmd.java | 3 ++-
.../cloudstack/api/commands/ListDedicatedHostsCmd.java | 3 ++-
.../cloudstack/api/commands/ListDedicatedPodsCmd.java | 3 ++-
.../cloudstack/api/commands/ListDedicatedZonesCmd.java | 3 ++-
.../api/commands/ReleaseDedicatedClusterCmd.java | 3 ++-
.../cloudstack/api/commands/ReleaseDedicatedHostCmd.java | 3 ++-
.../cloudstack/api/commands/ReleaseDedicatedPodCmd.java | 3 ++-
.../cloudstack/api/commands/ReleaseDedicatedZoneCmd.java | 3 ++-
.../com/cloud/api/commands/netapp/AssociateLunCmd.java | 3 ++-
.../src/com/cloud/api/commands/netapp/CreateLunCmd.java | 3 ++-
.../api/commands/netapp/CreateVolumeOnFilerCmd.java | 3 ++-
.../cloud/api/commands/netapp/CreateVolumePoolCmd.java | 3 ++-
.../cloud/api/commands/netapp/DeleteVolumePoolCmd.java | 3 ++-
.../src/com/cloud/api/commands/netapp/DestroyLunCmd.java | 3 ++-
.../api/commands/netapp/DestroyVolumeOnFilerCmd.java | 3 ++-
.../com/cloud/api/commands/netapp/DissociateLunCmd.java | 3 ++-
.../src/com/cloud/api/commands/netapp/ListLunsCmd.java | 3 ++-
.../cloud/api/commands/netapp/ListVolumePoolsCmd.java | 3 ++-
.../cloud/api/commands/netapp/ListVolumesOnFilerCmd.java | 3 ++-
.../cloud/api/commands/netapp/ModifyVolumePoolCmd.java | 3 ++-
.../org/apache/cloudstack/api/AddBaremetalDhcpCmd.java | 3 ++-
.../org/apache/cloudstack/api/AddBaremetalHostCmd.java | 3 ++-
.../cloudstack/api/AddBaremetalKickStartPxeCmd.java | 3 ++-
.../cloudstack/api/AddBaremetalPxePingServerCmd.java | 3 ++-
.../org/apache/cloudstack/api/ListBaremetalDhcpCmd.java | 3 ++-
.../cloudstack/api/ListBaremetalPxeServersCmd.java | 3 ++-
.../com/cloud/api/commands/ConfigureSimulatorCmd.java | 3 ++-
.../src/org/apache/cloudstack/api/AddUcsManagerCmd.java | 3 ++-
.../cloudstack/api/AssociateUcsProfileToBladeCmd.java | 3 ++-
.../org/apache/cloudstack/api/DeleteUcsManagerCmd.java | 3 ++-
.../src/org/apache/cloudstack/api/ListUcsBladeCmd.java | 3 ++-
.../src/org/apache/cloudstack/api/ListUcsManagerCmd.java | 3 ++-
.../src/org/apache/cloudstack/api/ListUcsProfileCmd.java | 3 ++-
.../com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java | 3 ++-
.../com/cloud/api/commands/DisableCiscoNexusVSMCmd.java | 3 ++-
.../com/cloud/api/commands/EnableCiscoNexusVSMCmd.java | 3 ++-
.../com/cloud/api/commands/ListCiscoNexusVSMsCmd.java | 3 ++-
.../api/command/admin/zone/AddVmwareDcCmd.java | 3 ++-
.../api/command/admin/zone/ListVmwareDcsCmd.java | 3 ++-
.../api/command/admin/zone/RemoveVmwareDcCmd.java | 3 ++-
.../com/cloud/api/commands/AddBigSwitchVnsDeviceCmd.java | 3 ++-
.../cloud/api/commands/DeleteBigSwitchVnsDeviceCmd.java | 3 ++-
.../cloud/api/commands/ListBigSwitchVnsDevicesCmd.java | 3 ++-
.../cloud/api/commands/AddCiscoAsa1000vResourceCmd.java | 3 ++-
.../com/cloud/api/commands/AddCiscoVnmcResourceCmd.java | 3 ++-
.../api/commands/DeleteCiscoAsa1000vResourceCmd.java | 3 ++-
.../cloud/api/commands/DeleteCiscoVnmcResourceCmd.java | 3 ++-
.../api/commands/ListCiscoAsa1000vResourcesCmd.java | 3 ++-
.../cloud/api/commands/ListCiscoVnmcResourcesCmd.java | 3 ++-
.../cloud/api/commands/AddExternalLoadBalancerCmd.java | 3 ++-
.../src/com/cloud/api/commands/AddF5LoadBalancerCmd.java | 3 ++-
.../cloud/api/commands/ConfigureF5LoadBalancerCmd.java | 3 ++-
.../api/commands/DeleteExternalLoadBalancerCmd.java | 3 ++-
.../com/cloud/api/commands/DeleteF5LoadBalancerCmd.java | 3 ++-
.../cloud/api/commands/ListExternalLoadBalancersCmd.java | 3 ++-
.../api/commands/ListF5LoadBalancerNetworksCmd.java | 3 ++-
.../com/cloud/api/commands/ListF5LoadBalancersCmd.java | 3 ++-
.../contrail/api/command/CreateServiceInstanceCmd.java | 4 +++-
.../com/cloud/api/commands/AddExternalFirewallCmd.java | 3 ++-
.../src/com/cloud/api/commands/AddSrxFirewallCmd.java | 3 ++-
.../com/cloud/api/commands/ConfigureSrxFirewallCmd.java | 3 ++-
.../cloud/api/commands/DeleteExternalFirewallCmd.java | 3 ++-
.../src/com/cloud/api/commands/DeleteSrxFirewallCmd.java | 3 ++-
.../com/cloud/api/commands/ListExternalFirewallsCmd.java | 3 ++-
.../cloud/api/commands/ListSrxFirewallNetworksCmd.java | 3 ++-
.../src/com/cloud/api/commands/ListSrxFirewallsCmd.java | 3 ++-
.../cloud/api/commands/AddNetscalerLoadBalancerCmd.java | 3 ++-
.../api/commands/ConfigureNetscalerLoadBalancerCmd.java | 3 ++-
.../api/commands/DeleteNetscalerLoadBalancerCmd.java | 3 ++-
.../commands/ListNetscalerLoadBalancerNetworksCmd.java | 3 ++-
.../api/commands/ListNetscalerLoadBalancersCmd.java | 3 ++-
.../com/cloud/api/commands/AddNiciraNvpDeviceCmd.java | 3 ++-
.../com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java | 3 ++-
.../api/commands/ListNiciraNvpDeviceNetworksCmd.java | 3 ++-
.../com/cloud/api/commands/ListNiciraNvpDevicesCmd.java | 3 ++-
.../api/commands/AddOpenDaylightControllerCmd.java | 3 ++-
.../api/commands/DeleteOpenDaylightControllerCmd.java | 3 ++-
.../api/commands/ListOpenDaylightControllersCmd.java | 3 ++-
.../com/cloud/api/commands/AddPaloAltoFirewallCmd.java | 3 ++-
.../cloud/api/commands/ConfigurePaloAltoFirewallCmd.java | 3 ++-
.../cloud/api/commands/DeletePaloAltoFirewallCmd.java | 3 ++-
.../api/commands/ListPaloAltoFirewallNetworksCmd.java | 3 ++-
.../com/cloud/api/commands/ListPaloAltoFirewallsCmd.java | 3 ++-
.../org/apache/cloudstack/api/commands/AddSspCmd.java | 3 ++-
.../org/apache/cloudstack/api/commands/DeleteSspCmd.java | 3 ++-
.../org/apache/cloudstack/api/command/LDAPConfigCmd.java | 4 +++-
.../org/apache/cloudstack/api/command/LDAPRemoveCmd.java | 3 ++-
.../cloudstack/api/command/LdapAddConfigurationCmd.java | 3 ++-
.../cloudstack/api/command/LdapCreateAccountCmd.java | 3 ++-
.../api/command/LdapDeleteConfigurationCmd.java | 3 ++-
.../cloudstack/api/command/LdapImportUsersCmd.java | 3 ++-
.../cloudstack/api/command/LdapListConfigurationCmd.java | 3 ++-
.../apache/cloudstack/api/command/LdapListUsersCmd.java | 3 ++-
.../apache/cloudstack/api/command/LdapUserSearchCmd.java | 3 ++-
server/src/com/cloud/api/ApiServer.java | 11 ++++++++++-
496 files changed, 1045 insertions(+), 496 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/APICommand.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/APICommand.java b/api/src/org/apache/cloudstack/api/APICommand.java
index 5587a48..f0b46a4 100644
--- a/api/src/org/apache/cloudstack/api/APICommand.java
+++ b/api/src/org/apache/cloudstack/api/APICommand.java
@@ -39,5 +39,9 @@ public @interface APICommand {
String since() default "";
+ boolean requestHasSensitiveInfo() default true;
+
+ boolean responseHasSensitiveInfo() default true;
+
RoleType[] authorized() default {};
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
index c5a2d1a..1a319d8 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
import com.cloud.user.UserAccount;
-@APICommand(name = "createAccount", description = "Creates an account", responseObject = AccountResponse.class)
+@APICommand(name = "createAccount", description = "Creates an account", responseObject = AccountResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = true)
public class CreateAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateAccountCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
index 7c1b206..9a7417a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
@@ -36,7 +36,8 @@ import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.user.User;
-@APICommand(name = "deleteAccount", description = "Deletes a account, and all users associated with this account", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteAccount", description = "Deletes a account, and all users associated with this account", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteAccountCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteAccountCmd.class.getName());
private static final String s_name = "deleteaccountresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
index 6fdbefe..642b748 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "disableAccount", description = "Disables an account", responseObject = AccountResponse.class)
+@APICommand(name = "disableAccount", description = "Disables an account", responseObject = AccountResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class DisableAccountCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DisableAccountCmd.class.getName());
private static final String s_name = "disableaccountresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
index 59d6acd..97913f5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.region.RegionService;
import com.cloud.user.Account;
-@APICommand(name = "enableAccount", description = "Enables an account", responseObject = AccountResponse.class)
+@APICommand(name = "enableAccount", description = "Enables an account", responseObject = AccountResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class EnableAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(EnableAccountCmd.class.getName());
private static final String s_name = "enableaccountresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
index 93ec1be..1fd3d7e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
@@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.DomainResponse;
import com.cloud.user.Account;
-@APICommand(name = "lockAccount", description = "Locks an account", responseObject = AccountResponse.class)
+@APICommand(name = "lockAccount", description = "Locks an account", responseObject = AccountResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class LockAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(LockAccountCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
index a8cf63f..61b1b31 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
@@ -35,7 +35,8 @@ import org.apache.cloudstack.region.RegionService;
import com.cloud.user.Account;
-@APICommand(name = "updateAccount", description = "Updates account information for the authenticated user", responseObject = AccountResponse.class)
+@APICommand(name = "updateAccount", description = "Updates account information for the authenticated user", responseObject = AccountResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class UpdateAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateAccountCmd.class.getName());
private static final String s_name = "updateaccountresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java b/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
index 3eaa053..58920d7 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
@@ -31,7 +31,8 @@ import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
-@APICommand(name = "generateAlert", description = "Generates an alert", responseObject = SuccessResponse.class, since = "4.3")
+@APICommand(name = "generateAlert", description = "Generates an alert", responseObject = SuccessResponse.class, since = "4.3",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class GenerateAlertCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(GenerateAlertCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
index 6c4b81b..ea71566 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.as.Counter;
import com.cloud.user.Account;
-@APICommand(name = "createCounter", description = "Adds metric counter", responseObject = CounterResponse.class)
+@APICommand(name = "createCounter", description = "Adds metric counter", responseObject = CounterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateCounterCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateCounterCmd.class.getName());
private static final String s_name = "counterresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
index 50477f5..3547ef1 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceInUseException;
import com.cloud.user.Account;
-@APICommand(name = "deleteCounter", description = "Deletes a counter", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteCounter", description = "Deletes a counter", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteCounterCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteCounterCmd.class.getName());
private static final String s_name = "deletecounterresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
index d0e7380..b9df18e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
@@ -38,7 +38,8 @@ import com.cloud.exception.ResourceInUseException;
import com.cloud.org.Cluster;
import com.cloud.user.Account;
-@APICommand(name = "addCluster", description = "Adds a new cluster", responseObject = ClusterResponse.class)
+@APICommand(name = "addCluster", description = "Adds a new cluster", responseObject = ClusterResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class AddClusterCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddClusterCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
index e1bc585..5d04675 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
-@APICommand(name = "deleteCluster", description = "Deletes a cluster.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteCluster", description = "Deletes a cluster.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteClusterCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteClusterCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
index 8640f37..432ca92 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.org.Cluster;
import com.cloud.utils.Pair;
-@APICommand(name = "listClusters", description = "Lists clusters.", responseObject = ClusterResponse.class)
+@APICommand(name = "listClusters", description = "Lists clusters.", responseObject = ClusterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListClustersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
index b13f81a..53d01c5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
@@ -30,7 +30,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.org.Cluster;
import com.cloud.user.Account;
-@APICommand(name = "updateCluster", description = "Updates an existing cluster", responseObject = ClusterResponse.class)
+@APICommand(name = "updateCluster", description = "Updates an existing cluster", responseObject = ClusterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateClusterCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddClusterCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
index 517807d..a34bc3e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
@@ -35,7 +35,8 @@ import org.apache.cloudstack.config.Configuration;
import com.cloud.utils.Pair;
-@APICommand(name = "listConfigurations", description = "Lists all configurations.", responseObject = ConfigurationResponse.class)
+@APICommand(name = "listConfigurations", description = "Lists all configurations.", responseObject = ConfigurationResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListCfgsByCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListCfgsByCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
index 1d9d2d9..b5a24b9 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
@@ -26,7 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.response.DeploymentPlannersResponse;
import org.apache.cloudstack.api.response.ListResponse;
-@APICommand(name = "listDeploymentPlanners", description = "Lists all DeploymentPlanners available.", responseObject = DeploymentPlannersResponse.class)
+@APICommand(name = "listDeploymentPlanners", description = "Lists all DeploymentPlanners available.", responseObject = DeploymentPlannersResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListDeploymentPlannersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDeploymentPlannersCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
index 16adf66..6d3c201 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
@@ -35,7 +35,9 @@ import com.cloud.utils.Pair;
@APICommand(name = "listHypervisorCapabilities",
description = "Lists all hypervisor capabilities.",
responseObject = HypervisorCapabilitiesResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListHypervisorCapabilitiesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListHypervisorCapabilitiesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
index 9bc9b3c..0124d59 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.config.Configuration;
import com.cloud.user.Account;
-@APICommand(name = "updateConfiguration", description = "Updates a configuration.", responseObject = ConfigurationResponse.class)
+@APICommand(name = "updateConfiguration", description = "Updates a configuration.", responseObject = ConfigurationResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateCfgCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateCfgCmd.class.getName());
private static final String s_name = "updateconfigurationresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
index 5cb5f9c..6550c89 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
@@ -32,7 +32,9 @@ import com.cloud.user.Account;
@APICommand(name = "updateHypervisorCapabilities",
description = "Updates a hypervisor capabilities.",
responseObject = HypervisorCapabilitiesResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class UpdateHypervisorCapabilitiesCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateHypervisorCapabilitiesCmd.class.getName());
private static final String s_name = "updatehypervisorcapabilitiesresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
index 4737555..312c9ee 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.domain.Domain;
import com.cloud.user.Account;
-@APICommand(name = "createDomain", description = "Creates a domain", responseObject = DomainResponse.class)
+@APICommand(name = "createDomain", description = "Creates a domain", responseObject = DomainResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateDomainCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateDomainCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
index b1075c1..a6d2b0b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
@@ -35,7 +35,8 @@ import com.cloud.domain.Domain;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "deleteDomain", description = "Deletes a specified domain", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteDomain", description = "Deletes a specified domain", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteDomainCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteDomainCmd.class.getName());
private static final String s_name = "deletedomainresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
index e1ba178..cf35295 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.domain.Domain;
import com.cloud.utils.Pair;
-@APICommand(name = "listDomainChildren", description = "Lists all children domains belonging to a specified domain", responseObject = DomainResponse.class)
+@APICommand(name = "listDomainChildren", description = "Lists all children domains belonging to a specified domain", responseObject = DomainResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListDomainChildrenCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDomainChildrenCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
index 5a3786c..1942afd 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.domain.Domain;
import com.cloud.utils.Pair;
-@APICommand(name = "listDomains", description = "Lists domains and provides detailed information for listed domains", responseObject = DomainResponse.class)
+@APICommand(name = "listDomains", description = "Lists domains and provides detailed information for listed domains", responseObject = DomainResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListDomainsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDomainsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
index 8acfcd5..409a84d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.region.RegionService;
import com.cloud.domain.Domain;
import com.cloud.user.Account;
-@APICommand(name = "updateDomain", description = "Updates a domain with a new name", responseObject = DomainResponse.class)
+@APICommand(name = "updateDomain", description = "Updates a domain with a new name", responseObject = DomainResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateDomainCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateDomainCmd.class.getName());
private static final String s_name = "updatedomainresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
index 363bcd6..960be8d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.DiscoveryException;
import com.cloud.host.Host;
import com.cloud.user.Account;
-@APICommand(name = "addHost", description = "Adds a new host.", responseObject = HostResponse.class)
+@APICommand(name = "addHost", description = "Adds a new host.", responseObject = HostResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class AddHostCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddHostCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
index b573bea..9108d60 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
@@ -31,7 +31,8 @@ import com.cloud.exception.DiscoveryException;
import com.cloud.storage.ImageStore;
import com.cloud.user.Account;
-@APICommand(name = "addSecondaryStorage", description = "Adds secondary storage.", responseObject = ImageStoreResponse.class)
+@APICommand(name = "addSecondaryStorage", description = "Adds secondary storage.", responseObject = ImageStoreResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddSecondaryStorageCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddSecondaryStorageCmd.class.getName());
private static final String s_name = "addsecondarystorageresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
index 46289ee..d23a765 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.host.Host;
import com.cloud.user.Account;
-@APICommand(name = "cancelHostMaintenance", description = "Cancels host maintenance.", responseObject = HostResponse.class)
+@APICommand(name = "cancelHostMaintenance", description = "Cancels host maintenance.", responseObject = HostResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CancelMaintenanceCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CancelMaintenanceCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
index 5a4478e..b994528 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
-@APICommand(name = "deleteHost", description = "Deletes a host.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteHost", description = "Deletes a host.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteHostCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteHostCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
index 0faf72c..dbb9438 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
@@ -34,7 +34,8 @@ import com.cloud.host.Host;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
-@APICommand(name = "findHostsForMigration", description = "Find hosts suitable for migrating a virtual machine.", responseObject = HostForMigrationResponse.class)
+@APICommand(name = "findHostsForMigration", description = "Find hosts suitable for migrating a virtual machine.", responseObject = HostForMigrationResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class FindHostsForMigrationCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(FindHostsForMigrationCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
index eda821b..d7aa18b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
@@ -42,7 +42,8 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
-@APICommand(name = "listHosts", description = "Lists hosts.", responseObject = HostResponse.class)
+@APICommand(name = "listHosts", description = "Lists hosts.", responseObject = HostResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListHostsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListHostsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
index 23cfacf..e49aabc 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.host.Host;
import com.cloud.user.Account;
-@APICommand(name = "prepareHostForMaintenance", description = "Prepares a host for maintenance.", responseObject = HostResponse.class)
+@APICommand(name = "prepareHostForMaintenance", description = "Prepares a host for maintenance.", responseObject = HostResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class PrepareForMaintenanceCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(PrepareForMaintenanceCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
index 1ce888b..5e15637 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.host.Host;
import com.cloud.user.Account;
-@APICommand(name = "reconnectHost", description = "Reconnects a host.", responseObject = HostResponse.class)
+@APICommand(name = "reconnectHost", description = "Reconnects a host.", responseObject = HostResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReconnectHostCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReconnectHostCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
index b60feca..6aeff63 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "releaseHostReservation", description = "Releases host reservation.", responseObject = SuccessResponse.class)
+@APICommand(name = "releaseHostReservation", description = "Releases host reservation.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReleaseHostReservationCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReleaseHostReservationCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
index d778b37..c6f6530 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.HostResponse;
import com.cloud.host.Host;
import com.cloud.user.Account;
-@APICommand(name = "updateHost", description = "Updates a host.", responseObject = HostResponse.class)
+@APICommand(name = "updateHost", description = "Updates a host.", responseObject = HostResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateHostCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateHostCmd.class.getName());
private static final String s_name = "updatehostresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
index 69480b1..94f5825 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
@@ -28,7 +28,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
-@APICommand(name = "updateHostPassword", description = "Update password of a host/pool on management server.", responseObject = SuccessResponse.class)
+@APICommand(name = "updateHostPassword", description = "Update password of a host/pool on management server.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class UpdateHostPasswordCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateHostPasswordCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
index 51da760..7e39749 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
@@ -43,7 +43,9 @@ import com.cloud.user.Account;
@APICommand(name = "configureInternalLoadBalancerElement",
responseObject = InternalLoadBalancerElementResponse.class,
description = "Configures an Internal Load Balancer element.",
- since = "4.2.0")
+ since = "4.2.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ConfigureInternalLoadBalancerElementCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ConfigureInternalLoadBalancerElementCmd.class.getName());
private static final String s_name = "configureinternalloadbalancerelementresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
index a6ece72..b9c61f3 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
@@ -41,7 +41,9 @@ import com.cloud.user.Account;
@APICommand(name = "createInternalLoadBalancerElement",
responseObject = InternalLoadBalancerElementResponse.class,
description = "Create an Internal Load Balancer element.",
- since = "4.2.0")
+ since = "4.2.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class CreateInternalLoadBalancerElementCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateInternalLoadBalancerElementCmd.class.getName());
private static final String s_name = "createinternalloadbalancerelementresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
index 0e01be1..43b18ee 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.network.router.VirtualRouter.Role;
-@APICommand(name = "listInternalLoadBalancerVMs", description = "List internal LB VMs.", responseObject = DomainRouterResponse.class)
+@APICommand(name = "listInternalLoadBalancerVMs", description = "List internal LB VMs.", responseObject = DomainRouterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListInternalLBVMsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListInternalLBVMsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
index a42a0b3..489b643 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
@@ -42,7 +42,9 @@ import com.cloud.network.VirtualRouterProvider;
@APICommand(name = "listInternalLoadBalancerElements",
description = "Lists all available Internal Load Balancer elements.",
responseObject = InternalLoadBalancerElementResponse.class,
- since = "4.2.0")
+ since = "4.2.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListInternalLoadBalancerElementsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListInternalLoadBalancerElementsCmd.class.getName());
private static final String Name = "listinternalloadbalancerelementsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
index 56dcb4f..a5b2bf7 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.router.VirtualRouter;
import com.cloud.network.router.VirtualRouter.Role;
-@APICommand(name = "startInternalLoadBalancerVM", responseObject = DomainRouterResponse.class, description = "Starts an existing internal lb vm.")
+@APICommand(name = "startInternalLoadBalancerVM", responseObject = DomainRouterResponse.class, description = "Starts an existing internal lb vm.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class StartInternalLBVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(StartInternalLBVMCmd.class.getName());
private static final String s_name = "startinternallbvmresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
index 9da4db0..88d864b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.router.VirtualRouter;
import com.cloud.network.router.VirtualRouter.Role;
-@APICommand(name = "stopInternalLoadBalancerVM", description = "Stops an Internal LB vm.", responseObject = DomainRouterResponse.class)
+@APICommand(name = "stopInternalLoadBalancerVM", description = "Stops an Internal LB vm.", responseObject = DomainRouterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class StopInternalLBVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(StopInternalLBVMCmd.class.getName());
private static final String s_name = "stopinternallbvmresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
index 7af9355..68c43c4 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
@@ -41,7 +41,8 @@ import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "addNetworkDevice",
description = "Adds a network device of one of the following types: ExternalDhcp, ExternalFirewall, ExternalLoadBalancer, PxeServer",
- responseObject = NetworkDeviceResponse.class)
+ responseObject = NetworkDeviceResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddNetworkDeviceCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddNetworkDeviceCmd.class);
private static final String s_name = "addnetworkdeviceresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
index f190493..bb87015 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
@@ -39,7 +39,9 @@ import com.cloud.user.Account;
@APICommand(name = "addNetworkServiceProvider",
description = "Adds a network serviceProvider to a physical network",
responseObject = ProviderResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(AddNetworkServiceProviderCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
index 5614295..cbc1936 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -41,7 +41,8 @@ import com.cloud.offering.NetworkOffering;
import com.cloud.offering.NetworkOffering.Availability;
import com.cloud.user.Account;
-@APICommand(name = "createNetworkOffering", description = "Creates a network offering.", responseObject = NetworkOfferingResponse.class, since = "3.0.0")
+@APICommand(name = "createNetworkOffering", description = "Creates a network offering.", responseObject = NetworkOfferingResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateNetworkOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkOfferingCmd.class.getName());
private static final String Name = "createnetworkofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
index de4e5e5..c691a18 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.PhysicalNetwork;
import com.cloud.user.Account;
-@APICommand(name = "createPhysicalNetwork", description = "Creates a physical network", responseObject = PhysicalNetworkResponse.class, since = "3.0.0")
+@APICommand(name = "createPhysicalNetwork", description = "Creates a physical network", responseObject = PhysicalNetworkResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreatePhysicalNetworkCmd.class.getName());
[46/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/624139d8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/624139d8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/624139d8
Branch: refs/heads/acl-item-cidrs
Commit: 624139d8ef9ea9462ba81d2d3941ee5ac9467b20
Parents: 88b5761
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Wed Feb 26 14:41:48 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Wed Feb 26 14:42:34 2014 +0530
----------------------------------------------------------------------
.../src/com/cloud/storage/dao/VolumeDao.java | 8 ++++++++
.../com/cloud/storage/dao/VolumeDaoImpl.java | 20 ++++++++++++++++++++
.../storage/volume/VolumeServiceImpl.java | 1 +
3 files changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/624139d8/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDao.java b/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
index 8dc0328..da0a5de 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
@@ -105,4 +105,12 @@ public interface VolumeDao extends GenericDao<VolumeVO, Long>, StateDao<Volume.S
* @return the scope of the storage pool where the volume is present (ZONE/CLUSTER)
*/
ScopeType getVolumeStoragePoolScope(long volumeId);
+
+ /***
+ * Updates the destVol uuid with srcVol uuid and sets the srcVol uuid as null.
+ * @param srcVolId
+ * @param destVolId
+ * @return returns true if transaction is successful.
+ */
+ boolean updateUuid(long srcVolId, long destVolId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/624139d8/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
index 5120387..326cba6 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -580,6 +580,26 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
}
@Override
+ @DB
+ public boolean updateUuid(long srcVolId, long destVolId) {
+ TransactionLegacy txn = TransactionLegacy.currentTxn();
+ txn.start();
+ try {
+ VolumeVO srcVol = findById(srcVolId);
+ VolumeVO destVol = findById(destVolId);
+ String uuid = srcVol.getUuid();
+ srcVol.setUuid(null);
+ destVol.setUuid(uuid);
+ update(srcVolId, srcVol);
+ update(destVolId, destVol);
+ } catch (Exception e) {
+ throw new CloudRuntimeException("Unable to persist the sequence number for this host");
+ }
+ txn.commit();
+ return true;
+ }
+
+ @Override
public ScopeType getVolumeStoragePoolScope(long volumeId) {
// finding the storage scope where the volume is present
TransactionLegacy txn = TransactionLegacy.currentTxn();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/624139d8/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 3e315da..fa0fd95 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -853,6 +853,7 @@ public class VolumeServiceImpl implements VolumeService {
}
srcVolume.processEvent(Event.OperationSuccessed);
destVolume.processEvent(Event.OperationSuccessed, result.getAnswer());
+ _volumeDao.updateUuid(srcVolume.getId(), destVolume.getId());
destroyVolume(srcVolume.getId());
srcVolume = volFactory.getVolume(srcVolume.getId());
AsyncCallFuture<VolumeApiResult> destroyFuture = expungeVolumeAsync(srcVolume);
[36/50] [abbrv] - Updated APICommand annotation to add new flags that
indicate if API request or response carry sensitive info - Updated all API
classes with the new annotation flag values as per the API's sensitivity -
Updated server code to check respo
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
index 439879a..a7f9436 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
@@ -43,7 +43,8 @@ import com.cloud.vm.Nic;
import com.cloud.vm.NicSecondaryIp;
import com.cloud.vm.VirtualMachine;
-@APICommand(name = "addIpToNic", description = "Assigns secondary IP to NIC", responseObject = NicSecondaryIpResponse.class)
+@APICommand(name = "addIpToNic", description = "Assigns secondary IP to NIC", responseObject = NicSecondaryIpResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddIpToVmNicCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddIpToVmNicCmd.class.getName());
private static final String s_name = "addiptovmnicresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
index 43efe16..46a2010 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
@@ -36,7 +36,8 @@ import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "addNicToVirtualMachine", description = "Adds VM to specified network by creating a NIC", responseObject = UserVmResponse.class)
+@APICommand(name = "addNicToVirtualMachine", description = "Adds VM to specified network by creating a NIC", responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class AddNicToVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddNicToVMCmd.class);
private static final String s_name = "addnictovirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 055832e..c6f4e19 100755
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -66,7 +66,8 @@ import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class)
+@APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(DeployVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
index 3c63e8d..9bfd611 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
@@ -38,7 +38,9 @@ import com.cloud.uservm.UserVm;
@APICommand(name = "destroyVirtualMachine",
description = "Destroys a virtual machine. Once destroyed, only the administrator can recover it.",
- responseObject = UserVmResponse.class)
+ responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
public class DestroyVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DestroyVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
index d0503d1..6c63213 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "getVMPassword", responseObject = GetVMPasswordResponse.class, description = "Returns an encrypted password for the VM")
+@APICommand(name = "getVMPassword", responseObject = GetVMPasswordResponse.class, description = "Returns an encrypted password for the VM",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class GetVMPasswordCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(GetVMPasswordCmd.class.getName());
private static final String s_name = "getvmpasswordresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
index 95d4990..3c66f03 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java
@@ -40,7 +40,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.vm.Nic;
-@APICommand(name = "listNics", description = "list the vm nics IP to NIC", responseObject = NicResponse.class)
+@APICommand(name = "listNics", description = "list the vm nics IP to NIC", responseObject = NicResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNicsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNicsCmd.class.getName());
private static final String s_name = "listnicsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
index 28637fb..54f735d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
@@ -43,7 +43,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.exception.InvalidParameterValueException;
-@APICommand(name = "listVirtualMachines", description = "List the virtual machines owned by the account.", responseObject = UserVmResponse.class)
+@APICommand(name = "listVirtualMachines", description = "List the virtual machines owned by the account.", responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class ListVMsCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListVMsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
index 7ac9138..c54d62f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "rebootVirtualMachine", description = "Reboots a virtual machine.", responseObject = UserVmResponse.class)
+@APICommand(name = "rebootVirtualMachine", description = "Reboots a virtual machine.", responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class RebootVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RebootVMCmd.class.getName());
private static final String s_name = "rebootvirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
index 2458247..c83bcda 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveIpFromVmNicCmd.java
@@ -37,7 +37,8 @@ import com.cloud.network.Network;
import com.cloud.user.Account;
import com.cloud.vm.NicSecondaryIp;
-@APICommand(name = "removeIpFromNic", description = "Removes secondary IP from the NIC.", responseObject = SuccessResponse.class)
+@APICommand(name = "removeIpFromNic", description = "Removes secondary IP from the NIC.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RemoveIpFromVmNicCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RemoveIpFromVmNicCmd.class.getName());
private static final String s_name = "removeipfromnicresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
index 92becb7..eb4f454 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
@@ -36,7 +36,8 @@ import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "removeNicFromVirtualMachine", description = "Removes VM from specified network by deleting a NIC", responseObject = UserVmResponse.class)
+@APICommand(name = "removeNicFromVirtualMachine", description = "Removes VM from specified network by deleting a NIC", responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class RemoveNicFromVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RemoveNicFromVMCmd.class);
private static final String s_name = "removenicfromvirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
index df34120..e8d5f73 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
@@ -35,7 +35,8 @@ import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@APICommand(name = "resetPasswordForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the password for virtual machine. "
- + "The virtual machine must be in a \"Stopped\" state and the template must already " + "support this feature for this command to take effect. [async]")
+ + "The virtual machine must be in a \"Stopped\" state and the template must already " + "support this feature for this command to take effect. [async]",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class ResetVMPasswordCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ResetVMPasswordCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
index 7436e3d..318d3c8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
@@ -38,7 +38,8 @@ import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@APICommand(name = "resetSSHKeyForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the SSH Key for virtual machine. "
- + "The virtual machine must be in a \"Stopped\" state. [async]")
+ + "The virtual machine must be in a \"Stopped\" state. [async]",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class ResetVMSSHKeyCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ResetVMSSHKeyCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
index b69b364..7c35680 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
@@ -39,7 +39,9 @@ import com.cloud.uservm.UserVm;
@APICommand(name = "restoreVirtualMachine",
description = "Restore a VM to original template/ISO or new template/ISO",
responseObject = UserVmResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
public class RestoreVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RestoreVMCmd.class);
private static final String s_name = "restorevmresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
index d234300..fe752cb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
@@ -43,7 +43,8 @@ import com.cloud.exception.VirtualMachineMigrationException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class)
+@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ScaleVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ScaleVMCmd.class.getName());
private static final String s_name = "scalevirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
index 4239a64..a59dc6e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
@@ -40,7 +40,8 @@ import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
import com.cloud.utils.exception.ExecutionException;
-@APICommand(name = "startVirtualMachine", responseObject = UserVmResponse.class, description = "Starts a virtual machine.")
+@APICommand(name = "startVirtualMachine", responseObject = UserVmResponse.class, description = "Starts a virtual machine.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class StartVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(StartVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
index 17f12f9..b547357 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ConcurrentOperationException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "stopVirtualMachine", responseObject = UserVmResponse.class, description = "Stops a virtual machine.")
+@APICommand(name = "stopVirtualMachine", responseObject = UserVmResponse.class, description = "Stops a virtual machine.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class StopVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(StopVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
index f699cce..26af16e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
@@ -36,7 +36,8 @@ import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "updateDefaultNicForVirtualMachine", description = "Changes the default NIC on a VM", responseObject = UserVmResponse.class)
+@APICommand(name = "updateDefaultNicForVirtualMachine", description = "Changes the default NIC on a VM", responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class UpdateDefaultNicForVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateDefaultNicForVMCmd.class);
private static final String s_name = "updatedefaultnicforvirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
index 1b5613c..fc3be33 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
@@ -35,7 +35,8 @@ import com.cloud.uservm.UserVm;
@APICommand(name = "updateVirtualMachine", description = "Updates properties of a virtual machine. The VM has to be stopped and restarted for the "
+ "new properties to take effect. UpdateVirtualMachine does not first check whether the VM is stopped. "
- + "Therefore, stop the VM manually before issuing this call.", responseObject = UserVmResponse.class)
+ + "Therefore, stop the VM manually before issuing this call.", responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class UpdateVMCmd extends BaseCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVMCmd.class.getName());
private static final String s_name = "updatevirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
index 12ab711..46cce80 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
@@ -39,7 +39,8 @@ import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@APICommand(name = "changeServiceForVirtualMachine", responseObject = UserVmResponse.class, description = "Changes the service offering for a virtual machine. "
- + "The virtual machine must be in a \"Stopped\" state for " + "this command to take effect.")
+ + "The virtual machine must be in a \"Stopped\" state for " + "this command to take effect.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class UpgradeVMCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
private static final String s_name = "changeserviceforvirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
index 937fca3..4676def 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.vm.InstanceGroup;
-@APICommand(name = "createInstanceGroup", description = "Creates a vm group", responseObject = InstanceGroupResponse.class)
+@APICommand(name = "createInstanceGroup", description = "Creates a vm group", responseObject = InstanceGroupResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVMGroupCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateVMGroupCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
index fbfb85a..f88f45e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
import com.cloud.vm.InstanceGroup;
-@APICommand(name = "deleteInstanceGroup", description = "Deletes a vm group", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteInstanceGroup", description = "Deletes a vm group", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteVMGroupCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVMGroupCmd.class.getName());
private static final String s_name = "deleteinstancegroupresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
index fda3e88..6d58260 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java
@@ -25,7 +25,8 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.InstanceGroupResponse;
import org.apache.cloudstack.api.response.ListResponse;
-@APICommand(name = "listInstanceGroups", description = "Lists vm groups", responseObject = InstanceGroupResponse.class)
+@APICommand(name = "listInstanceGroups", description = "Lists vm groups", responseObject = InstanceGroupResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVMGroupsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListVMGroupsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
index 1930bd8..cc738cd 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.InstanceGroupResponse;
import com.cloud.user.Account;
import com.cloud.vm.InstanceGroup;
-@APICommand(name = "updateInstanceGroup", description = "Updates a vm group", responseObject = InstanceGroupResponse.class)
+@APICommand(name = "updateInstanceGroup", description = "Updates a vm group", responseObject = InstanceGroupResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateVMGroupCmd extends BaseCmd {
private static final String s_name = "updateinstancegroupresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java
index de921f6..be78528 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.uservm.UserVm;
import com.cloud.vm.snapshot.VMSnapshot;
-@APICommand(name = "createVMSnapshot", description = "Creates snapshot for a vm.", responseObject = VMSnapshotResponse.class, since = "4.2.0")
+@APICommand(name = "createVMSnapshot", description = "Creates snapshot for a vm.", responseObject = VMSnapshotResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVMSnapshotCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateVMSnapshotCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
index d29ff05..bee8546 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.vm.snapshot.VMSnapshot;
-@APICommand(name = "deleteVMSnapshot", description = "Deletes a vmsnapshot.", responseObject = SuccessResponse.class, since = "4.2.0")
+@APICommand(name = "deleteVMSnapshot", description = "Deletes a vmsnapshot.", responseObject = SuccessResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteVMSnapshotCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVMSnapshotCmd.class.getName());
private static final String s_name = "deletevmsnapshotresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java
index 84b552c..adebb6e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.VMSnapshotResponse;
import com.cloud.vm.snapshot.VMSnapshot;
-@APICommand(name = "listVMSnapshot", description = "List virtual machine snapshot by conditions", responseObject = VMSnapshotResponse.class, since = "4.2.0")
+@APICommand(name = "listVMSnapshot", description = "List virtual machine snapshot by conditions", responseObject = VMSnapshotResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVMSnapshotCmd extends BaseListTaggedResourcesCmd {
private static final String s_name = "listvmsnapshotresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
index cec2154..91661f6 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
@@ -37,7 +37,8 @@ import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
import com.cloud.vm.snapshot.VMSnapshot;
-@APICommand(name = "revertToVMSnapshot", description = "Revert VM from a vmsnapshot.", responseObject = UserVmResponse.class, since = "4.2.0")
+@APICommand(name = "revertToVMSnapshot", description = "Revert VM from a vmsnapshot.", responseObject = UserVmResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class RevertToVMSnapshotCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RevertToVMSnapshotCmd.class.getName());
private static final String s_name = "reverttovmsnapshotresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
index 8c6713d..d53059e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
@@ -31,7 +31,8 @@ import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.server.ResourceTag;
-@APICommand(name = "addResourceDetail", description = "Adds detail for the Resource.", responseObject = SuccessResponse.class)
+@APICommand(name = "addResourceDetail", description = "Adds detail for the Resource.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddResourceDetailCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddResourceDetailCmd.class.getName());
private static final String s_name = "addresourcedetailresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
index cd1e1ed..714d7cb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
-@APICommand(name = "attachVolume", description = "Attaches a disk volume to a virtual machine.", responseObject = VolumeResponse.class)
+@APICommand(name = "attachVolume", description = "Attaches a disk volume to a virtual machine.", responseObject = VolumeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AttachVolumeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AttachVolumeCmd.class.getName());
private static final String s_name = "attachvolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
index ebade66..ee0ab0c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
@@ -42,7 +42,8 @@ import com.cloud.storage.Volume;
@APICommand(name = "createVolume",
responseObject = VolumeResponse.class,
- description = "Creates a disk volume from a disk offering. This disk volume must still be attached to a virtual machine to make use of it.")
+ description = "Creates a disk volume from a disk offering. This disk volume must still be attached to a virtual machine to make use of it.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVolumeCmd extends BaseAsyncCreateCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(CreateVolumeCmd.class.getName());
private static final String s_name = "createvolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
index 550adb9..2c66dea 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
@@ -32,7 +32,8 @@ import com.cloud.exception.ConcurrentOperationException;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
-@APICommand(name = "deleteVolume", description = "Deletes a detached disk volume.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteVolume", description = "Deletes a detached disk volume.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteVolumeCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVolumeCmd.class.getName());
private static final String s_name = "deletevolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
index 70283ff..2b87ff8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
@@ -34,7 +34,8 @@ import com.cloud.storage.Volume;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "detachVolume", description = "Detaches a disk volume from a virtual machine.", responseObject = VolumeResponse.class)
+@APICommand(name = "detachVolume", description = "Detaches a disk volume from a virtual machine.", responseObject = VolumeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DetachVolumeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DetachVolumeCmd.class.getName());
private static final String s_name = "detachvolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
index d73143a..da466fd 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
@@ -36,7 +36,8 @@ import com.cloud.storage.Upload;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
-@APICommand(name = "extractVolume", description = "Extracts volume", responseObject = ExtractResponse.class)
+@APICommand(name = "extractVolume", description = "Extracts volume", responseObject = ExtractResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ExtractVolumeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ExtractVolumeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
index 2f86c92..0aeff0c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.server.ResourceTag;
-@APICommand(name = "listResourceDetails", description = "List resource detail(s)", responseObject = ResourceTagResponse.class, since = "4.2")
+@APICommand(name = "listResourceDetails", description = "List resource detail(s)", responseObject = ResourceTagResponse.class, since = "4.2",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListResourceDetailsCmd extends BaseListProjectAndAccountResourcesCmd {
private static final String s_name = "listresourcedetailsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
index 4ebe3bf..8c998a5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-@APICommand(name = "listVolumes", description = "Lists all volumes.", responseObject = VolumeResponse.class)
+@APICommand(name = "listVolumes", description = "Lists all volumes.", responseObject = VolumeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVolumesCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListVolumesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
index fa6ac69..47bf26f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
@@ -29,7 +29,8 @@ import com.cloud.event.EventTypes;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
-@APICommand(name = "migrateVolume", description = "Migrate volume", responseObject = VolumeResponse.class, since = "3.0.0")
+@APICommand(name = "migrateVolume", description = "Migrate volume", responseObject = VolumeResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class MigrateVolumeCmd extends BaseAsyncCmd {
private static final String s_name = "migratevolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
index c4c7554..6fe576d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/RemoveResourceDetailCmd.java
@@ -28,7 +28,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.server.ResourceTag;
-@APICommand(name = "removeResourceDetail", description = "Removes detail for the Resource.", responseObject = SuccessResponse.class)
+@APICommand(name = "removeResourceDetail", description = "Removes detail for the Resource.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RemoveResourceDetailCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RemoveResourceDetailCmd.class.getName());
private static final String s_name = "removeresourcedetailresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
index e691944..a95c95b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
@@ -36,7 +36,8 @@ import com.cloud.projects.Project;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
-@APICommand(name = "resizeVolume", description = "Resizes a volume", responseObject = VolumeResponse.class)
+@APICommand(name = "resizeVolume", description = "Resizes a volume", responseObject = VolumeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ResizeVolumeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ResizeVolumeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
index 9f501bf..2d2b215 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.storage.Volume;
-@APICommand(name = "updateVolume", description = "Updates the volume.", responseObject = VolumeResponse.class)
+@APICommand(name = "updateVolume", description = "Updates the volume.", responseObject = VolumeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateVolumeCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVolumeCmd.class.getName());
private static final String s_name = "updatevolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
index 991cfc1..2d97ec9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
@@ -38,7 +38,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.Volume;
-@APICommand(name = "uploadVolume", description = "Uploads a data disk.", responseObject = VolumeResponse.class)
+@APICommand(name = "uploadVolume", description = "Uploads a data disk.", responseObject = VolumeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UploadVolumeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UploadVolumeCmd.class.getName());
private static final String s_name = "uploadvolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
index f2d2bce..7df5e37 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
@@ -39,7 +39,8 @@ import com.cloud.network.vpc.StaticRoute;
import com.cloud.network.vpc.Vpc;
import com.cloud.network.vpc.VpcGateway;
-@APICommand(name = "createStaticRoute", description = "Creates a static route", responseObject = StaticRouteResponse.class)
+@APICommand(name = "createStaticRoute", description = "Creates a static route", responseObject = StaticRouteResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateStaticRouteCmd extends BaseAsyncCreateCmd {
private static final String s_name = "createstaticrouteresponse";
public static final Logger s_logger = Logger.getLogger(CreateStaticRouteCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
index dfec95c..62fa29f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
@@ -38,7 +38,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.Vpc;
-@APICommand(name = "createVPC", description = "Creates a VPC", responseObject = VpcResponse.class)
+@APICommand(name = "createVPC", description = "Creates a VPC", responseObject = VpcResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVPCCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateVPCCmd.class.getName());
private static final String s_name = "createvpcresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
index 937341e..dfa4910 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.StaticRoute;
-@APICommand(name = "deleteStaticRoute", description = "Deletes a static route", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteStaticRoute", description = "Deletes a static route", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteStaticRouteCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteStaticRouteCmd.class.getName());
private static final String s_name = "deletestaticrouteresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
index 14f21ba..94ad9e4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.Vpc;
import com.cloud.user.Account;
-@APICommand(name = "deleteVPC", description = "Deletes a VPC", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteVPC", description = "Deletes a VPC", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteVPCCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVPCCmd.class.getName());
private static final String s_name = "deletevpcresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
index 7870673..ff2d0bc 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.VpcResponse;
import com.cloud.network.vpc.PrivateGateway;
import com.cloud.utils.Pair;
-@APICommand(name = "listPrivateGateways", description = "List private gateways", responseObject = PrivateGatewayResponse.class)
+@APICommand(name = "listPrivateGateways", description = "List private gateways", responseObject = PrivateGatewayResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListPrivateGatewaysCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListPrivateGatewaysCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java
index 931431b..83865ca 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.VpcResponse;
import com.cloud.network.vpc.StaticRoute;
import com.cloud.utils.Pair;
-@APICommand(name = "listStaticRoutes", description = "Lists all static routes", responseObject = StaticRouteResponse.class)
+@APICommand(name = "listStaticRoutes", description = "Lists all static routes", responseObject = StaticRouteResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListStaticRoutesCmd extends BaseListTaggedResourcesCmd {
private static final String s_name = "liststaticroutesresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
index e3d0bc6..66ea176 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.VpcOfferingResponse;
import com.cloud.network.vpc.VpcOffering;
-@APICommand(name = "listVPCOfferings", description = "Lists VPC offerings", responseObject = VpcOfferingResponse.class)
+@APICommand(name = "listVPCOfferings", description = "Lists VPC offerings", responseObject = VpcOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVPCOfferingsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListVPCOfferingsCmd.class.getName());
private static final String Name = "listvpcofferingsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
index 45ab863..e81bf69 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.network.vpc.Vpc;
-@APICommand(name = "listVPCs", description = "Lists VPCs", responseObject = VpcResponse.class)
+@APICommand(name = "listVPCs", description = "Lists VPCs", responseObject = VpcResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVPCsCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListVPCsCmd.class.getName());
private static final String s_name = "listvpcsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
index eb048ce..f68760b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.Vpc;
import com.cloud.user.Account;
-@APICommand(name = "restartVPC", description = "Restarts a VPC", responseObject = VpcResponse.class)
+@APICommand(name = "restartVPC", description = "Restarts a VPC", responseObject = VpcResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RestartVPCCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RestartVPCCmd.class.getName());
private static final String Name = "restartvpcresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
index 1900def..f0b9814 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
@@ -31,7 +31,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.vpc.Vpc;
import com.cloud.user.Account;
-@APICommand(name = "updateVPC", description = "Updates a VPC", responseObject = VpcResponse.class)
+@APICommand(name = "updateVPC", description = "Updates a VPC", responseObject = VpcResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateVPCCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVPCCmd.class.getName());
private static final String Name = "updatevpcresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
index 7c58117..45d8703 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
@@ -34,7 +34,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.VpnUser;
import com.cloud.user.Account;
-@APICommand(name = "addVpnUser", description = "Adds vpn users", responseObject = VpnUsersResponse.class)
+@APICommand(name = "addVpnUser", description = "Adds vpn users", responseObject = VpnUsersResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddVpnUserCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(AddVpnUserCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
index a5e8d62..7f56353 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.IpAddress;
import com.cloud.network.RemoteAccessVpn;
-@APICommand(name = "createRemoteAccessVpn", description = "Creates a l2tp/ipsec remote access vpn", responseObject = RemoteAccessVpnResponse.class)
+@APICommand(name = "createRemoteAccessVpn", description = "Creates a l2tp/ipsec remote access vpn", responseObject = RemoteAccessVpnResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateRemoteAccessVpnCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
index bd603e1..96adf5f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
@@ -36,7 +36,8 @@ import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.network.Site2SiteVpnGateway;
import com.cloud.network.vpc.Vpc;
-@APICommand(name = "createVpnConnection", description = "Create site to site vpn connection", responseObject = Site2SiteVpnConnectionResponse.class)
+@APICommand(name = "createVpnConnection", description = "Create site to site vpn connection", responseObject = Site2SiteVpnConnectionResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVpnConnectionCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateVpnConnectionCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
index 821a4b0..1894835 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteCustomerGateway;
-@APICommand(name = "createVpnCustomerGateway", description = "Creates site to site vpn customer gateway", responseObject = Site2SiteCustomerGatewayResponse.class)
+@APICommand(name = "createVpnCustomerGateway", description = "Creates site to site vpn customer gateway", responseObject = Site2SiteCustomerGatewayResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVpnCustomerGatewayCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CreateVpnCustomerGatewayCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
index a48159f..03fa9c4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
@@ -31,7 +31,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteVpnGateway;
import com.cloud.network.vpc.Vpc;
-@APICommand(name = "createVpnGateway", description = "Creates site to site vpn local gateway", responseObject = Site2SiteVpnGatewayResponse.class)
+@APICommand(name = "createVpnGateway", description = "Creates site to site vpn local gateway", responseObject = Site2SiteVpnGatewayResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVpnGatewayCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CreateVpnGatewayCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
index 41a8f1e..c9464e0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
@@ -32,7 +32,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.RemoteAccessVpn;
-@APICommand(name = "deleteRemoteAccessVpn", description = "Destroys a l2tp/ipsec remote access vpn", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteRemoteAccessVpn", description = "Destroys a l2tp/ipsec remote access vpn", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteRemoteAccessVpnCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
index c86cc59..7014ed7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java
@@ -32,7 +32,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.user.Account;
-@APICommand(name = "deleteVpnConnection", description = "Delete site to site vpn connection", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteVpnConnection", description = "Delete site to site vpn connection", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteVpnConnectionCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVpnConnectionCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
index 4c777d7..4ba5b43 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java
@@ -31,7 +31,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteCustomerGateway;
import com.cloud.user.Account;
-@APICommand(name = "deleteVpnCustomerGateway", description = "Delete site to site vpn customer gateway", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteVpnCustomerGateway", description = "Delete site to site vpn customer gateway", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteVpnCustomerGatewayCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVpnCustomerGatewayCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
index 85f4004..41b78d9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java
@@ -31,7 +31,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteVpnGateway;
import com.cloud.user.Account;
-@APICommand(name = "deleteVpnGateway", description = "Delete site to site vpn gateway", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteVpnGateway", description = "Delete site to site vpn gateway", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteVpnGatewayCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVpnGatewayCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
index 01e6d37..56acd41 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.RemoteAccessVpnResponse;
import com.cloud.network.RemoteAccessVpn;
import com.cloud.utils.Pair;
-@APICommand(name = "listRemoteAccessVpns", description = "Lists remote access vpns", responseObject = RemoteAccessVpnResponse.class)
+@APICommand(name = "listRemoteAccessVpns", description = "Lists remote access vpns", responseObject = RemoteAccessVpnResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListRemoteAccessVpnsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListRemoteAccessVpnsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
index 8de6059..28ab8b9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.VpcResponse;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.utils.Pair;
-@APICommand(name = "listVpnConnections", description = "Lists site to site vpn connection gateways", responseObject = Site2SiteVpnConnectionResponse.class)
+@APICommand(name = "listVpnConnections", description = "Lists site to site vpn connection gateways", responseObject = Site2SiteVpnConnectionResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVpnConnectionsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListVpnConnectionsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
index 5cd4bfb..e5bc1dc 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse;
import com.cloud.network.Site2SiteCustomerGateway;
import com.cloud.utils.Pair;
-@APICommand(name = "listVpnCustomerGateways", description = "Lists site to site vpn customer gateways", responseObject = Site2SiteCustomerGatewayResponse.class)
+@APICommand(name = "listVpnCustomerGateways", description = "Lists site to site vpn customer gateways", responseObject = Site2SiteCustomerGatewayResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVpnCustomerGatewaysCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListVpnCustomerGatewaysCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
index 75a5e81..d1729d7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.VpcResponse;
import com.cloud.network.Site2SiteVpnGateway;
import com.cloud.utils.Pair;
-@APICommand(name = "listVpnGateways", description = "Lists site 2 site vpn gateways", responseObject = Site2SiteVpnGatewayResponse.class)
+@APICommand(name = "listVpnGateways", description = "Lists site 2 site vpn gateways", responseObject = Site2SiteVpnGatewayResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVpnGatewaysCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListVpnGatewaysCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
index 5136633..16b7ced 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.VpnUsersResponse;
import com.cloud.network.VpnUser;
import com.cloud.utils.Pair;
-@APICommand(name = "listVpnUsers", description = "Lists vpn users", responseObject = VpnUsersResponse.class)
+@APICommand(name = "listVpnUsers", description = "Lists vpn users", responseObject = VpnUsersResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVpnUsersCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListVpnUsersCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
index 4eeef67..d49a208 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "removeVpnUser", description = "Removes vpn user", responseObject = SuccessResponse.class)
+@APICommand(name = "removeVpnUser", description = "Removes vpn user", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RemoveVpnUserCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RemoveVpnUserCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
index efe6db8..8c3f1d6 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.user.Account;
-@APICommand(name = "resetVpnConnection", description = "Reset site to site vpn connection", responseObject = Site2SiteVpnConnectionResponse.class)
+@APICommand(name = "resetVpnConnection", description = "Reset site to site vpn connection", responseObject = Site2SiteVpnConnectionResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ResetVpnConnectionCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ResetVpnConnectionCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java
index 9f552db..08d3b0a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateRemoteAccessVpnCmd.java
@@ -29,7 +29,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.RemoteAccessVpn;
-@APICommand(name = "updateRemoteAccessVpn", description = "Updates remote access vpn", responseObject = RemoteAccessVpnResponse.class, since = "4.4")
+@APICommand(name = "updateRemoteAccessVpn", description = "Updates remote access vpn", responseObject = RemoteAccessVpnResponse.class, since = "4.4",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateRemoteAccessVpnCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateRemoteAccessVpnCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java
index 662187c..282afe0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnConnectionCmd.java
@@ -28,7 +28,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.user.Account;
-@APICommand(name = "updateVpnConnection", description = "Updates site to site vpn connection", responseObject = Site2SiteVpnConnectionResponse.class, since = "4.4")
+@APICommand(name = "updateVpnConnection", description = "Updates site to site vpn connection", responseObject = Site2SiteVpnConnectionResponse.class, since = "4.4",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateVpnConnectionCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVpnConnectionCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
index 5694a74..e0cafed 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteCustomerGateway;
-@APICommand(name = "updateVpnCustomerGateway", description = "Update site to site vpn customer gateway", responseObject = Site2SiteCustomerGatewayResponse.class)
+@APICommand(name = "updateVpnCustomerGateway", description = "Update site to site vpn customer gateway", responseObject = Site2SiteCustomerGatewayResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVpnCustomerGatewayCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java
index eabc04a..66c59ad 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnGatewayCmd.java
@@ -28,7 +28,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.Site2SiteVpnGateway;
import com.cloud.user.Account;
-@APICommand(name = "updateVpnGateway", description = "Updates site to site vpn local gateway", responseObject = Site2SiteVpnGatewayResponse.class, since = "4.4")
+@APICommand(name = "updateVpnGateway", description = "Updates site to site vpn local gateway", responseObject = Site2SiteVpnGatewayResponse.class, since = "4.4",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateVpnGatewayCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVpnGatewayCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
index 471e6d6..e395948 100644
--- a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.exception.InvalidParameterValueException;
-@APICommand(name = "listZones", description = "Lists zones", responseObject = ZoneResponse.class)
+@APICommand(name = "listZones", description = "Lists zones", responseObject = ZoneResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListZonesByCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListZonesByCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java
----------------------------------------------------------------------
diff --git a/plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java b/plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java
index 206d793..be0d5d5 100644
--- a/plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java
+++ b/plugins/api/discovery/src/org/apache/cloudstack/api/command/user/discovery/ListApisCmd.java
@@ -36,7 +36,9 @@ import com.cloud.user.User;
@APICommand(name = "listApis",
responseObject = ApiDiscoveryResponse.class,
description = "lists all available apis on the server, provided by the Api Discovery plugin",
- since = "4.1.0")
+ since = "4.1.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListApisCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ListApisCmd.class.getName());
[47/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
findbugs possible nullpointer mitigated
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e431538b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e431538b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e431538b
Branch: refs/heads/acl-item-cidrs
Commit: e431538b0a59d4bedad1fcf23ded89816f991a64
Parents: 624139d
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Feb 26 11:56:49 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Wed Feb 26 11:56:49 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/api/ApiServer.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e431538b/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index f0fc372..ba58b52 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -366,9 +366,13 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
Class<?> cmdClass = getCmdClass(command[0]);
- APICommand annotation = cmdClass.getAnnotation(APICommand.class);
-
if (cmdClass != null) {
+ APICommand annotation = cmdClass.getAnnotation(APICommand.class);
+ if (annotation == null) {
+ s_logger.error("No APICommand annotation found for class " + cmdClass.getCanonicalName());
+ throw new CloudRuntimeException("No APICommand annotation found for class " + cmdClass.getCanonicalName());
+ }
+
BaseCmd cmdObj = (BaseCmd)cmdClass.newInstance();
cmdObj = ComponentContext.inject(cmdObj);
cmdObj.configure();
[03/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VMAppliance.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VMAppliance.java b/deps/XenServerJava/src/com/xensource/xenapi/VMAppliance.java
index b7e7e36..a0eb0d6 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VMAppliance.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VMAppliance.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VMAppliance extends XenAPIObject {
* For internal use only.
*/
VMAppliance(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VMAppliance extends XenAPIObject {
{
if (obj != null && obj instanceof VMAppliance)
{
- VMAppliance other = (VMAppliance)obj;
+ VMAppliance other = (VMAppliance) obj;
return other.ref.equals(this.ref);
} else
{
@@ -111,8 +112,8 @@ public class VMAppliance extends XenAPIObject {
/**
* Convert a VM_appliance.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -154,15 +155,15 @@ public class VMAppliance extends XenAPIObject {
* @return all fields from the object
*/
public VMAppliance.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMApplianceRecord(result);
+ return Types.toVMApplianceRecord(result);
}
/**
@@ -172,15 +173,15 @@ public class VMAppliance extends XenAPIObject {
* @return reference to the object
*/
public static VMAppliance getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMAppliance(result);
+ return Types.toVMAppliance(result);
}
/**
@@ -190,9 +191,9 @@ public class VMAppliance extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, VMAppliance.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VM_appliance.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -209,16 +210,16 @@ public class VMAppliance extends XenAPIObject {
* @return reference to the newly created object
*/
public static VMAppliance create(Connection c, VMAppliance.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMAppliance(result);
+ return Types.toVMAppliance(result);
}
/**
@@ -227,9 +228,9 @@ public class VMAppliance extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VM_appliance.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -243,9 +244,9 @@ public class VMAppliance extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -260,15 +261,15 @@ public class VMAppliance extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<VMAppliance> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVMAppliance(result);
+ return Types.toSetOfVMAppliance(result);
}
/**
@@ -277,15 +278,15 @@ public class VMAppliance extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -294,15 +295,15 @@ public class VMAppliance extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -311,15 +312,15 @@ public class VMAppliance extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -328,15 +329,15 @@ public class VMAppliance extends XenAPIObject {
* @return value of the field
*/
public Set<Types.VmApplianceOperation> getAllowedOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_allowed_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVmApplianceOperation(result);
+ return Types.toSetOfVmApplianceOperation(result);
}
/**
@@ -345,15 +346,15 @@ public class VMAppliance extends XenAPIObject {
* @return value of the field
*/
public Map<String, Types.VmApplianceOperation> getCurrentOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_current_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringVmApplianceOperation(result);
+ return Types.toMapOfStringVmApplianceOperation(result);
}
/**
@@ -362,15 +363,15 @@ public class VMAppliance extends XenAPIObject {
* @return value of the field
*/
public Set<VM> getVMs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_VMs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVM(result);
+ return Types.toSetOfVM(result);
}
/**
@@ -379,9 +380,9 @@ public class VMAppliance extends XenAPIObject {
* @param label New value to set
*/
public void setNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(label)};
@@ -395,9 +396,9 @@ public class VMAppliance extends XenAPIObject {
* @param description New value to set
*/
public void setNameDescription(Connection c, String description) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(description)};
@@ -412,10 +413,10 @@ public class VMAppliance extends XenAPIObject {
* @return Task
*/
public Task startAsync(Connection c, Boolean paused) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OperationPartiallyFailed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OperationPartiallyFailed {
String method_call = "Async.VM_appliance.start";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(paused)};
@@ -430,10 +431,10 @@ public class VMAppliance extends XenAPIObject {
* @param paused Instantiate all VMs belonging to this appliance in paused state if set to true.
*/
public void start(Connection c, Boolean paused) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OperationPartiallyFailed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OperationPartiallyFailed {
String method_call = "VM_appliance.start";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(paused)};
@@ -447,10 +448,10 @@ public class VMAppliance extends XenAPIObject {
* @return Task
*/
public Task cleanShutdownAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OperationPartiallyFailed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OperationPartiallyFailed {
String method_call = "Async.VM_appliance.clean_shutdown";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -464,10 +465,10 @@ public class VMAppliance extends XenAPIObject {
*
*/
public void cleanShutdown(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OperationPartiallyFailed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OperationPartiallyFailed {
String method_call = "VM_appliance.clean_shutdown";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -481,10 +482,10 @@ public class VMAppliance extends XenAPIObject {
* @return Task
*/
public Task hardShutdownAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OperationPartiallyFailed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OperationPartiallyFailed {
String method_call = "Async.VM_appliance.hard_shutdown";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -498,10 +499,10 @@ public class VMAppliance extends XenAPIObject {
*
*/
public void hardShutdown(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OperationPartiallyFailed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OperationPartiallyFailed {
String method_call = "VM_appliance.hard_shutdown";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -515,10 +516,10 @@ public class VMAppliance extends XenAPIObject {
* @return Task
*/
public Task shutdownAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OperationPartiallyFailed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OperationPartiallyFailed {
String method_call = "Async.VM_appliance.shutdown";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -532,10 +533,10 @@ public class VMAppliance extends XenAPIObject {
*
*/
public void shutdown(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.OperationPartiallyFailed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.OperationPartiallyFailed {
String method_call = "VM_appliance.shutdown";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -550,10 +551,10 @@ public class VMAppliance extends XenAPIObject {
* @return Task
*/
public Task assertCanBeRecoveredAsync(Connection c, Session sessionTo) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VmRequiresSr {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VmRequiresSr {
String method_call = "Async.VM_appliance.assert_can_be_recovered";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(sessionTo)};
@@ -568,10 +569,10 @@ public class VMAppliance extends XenAPIObject {
* @param sessionTo The session to which the VM appliance is to be recovered.
*/
public void assertCanBeRecovered(Connection c, Session sessionTo) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VmRequiresSr {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VmRequiresSr {
String method_call = "VM_appliance.assert_can_be_recovered";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(sessionTo)};
@@ -587,10 +588,10 @@ public class VMAppliance extends XenAPIObject {
* @return Task
*/
public Task recoverAsync(Connection c, Session sessionTo, Boolean force) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VmRequiresSr {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VmRequiresSr {
String method_call = "Async.VM_appliance.recover";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(sessionTo), Marshalling.toXMLRPC(force)};
@@ -606,10 +607,10 @@ public class VMAppliance extends XenAPIObject {
* @param force Whether the VMs should replace newer versions of themselves.
*/
public void recover(Connection c, Session sessionTo, Boolean force) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VmRequiresSr {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VmRequiresSr {
String method_call = "VM_appliance.recover";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(sessionTo), Marshalling.toXMLRPC(force)};
@@ -623,15 +624,15 @@ public class VMAppliance extends XenAPIObject {
* @return references to all objects
*/
public static Set<VMAppliance> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVMAppliance(result);
+ return Types.toSetOfVMAppliance(result);
}
/**
@@ -640,15 +641,15 @@ public class VMAppliance extends XenAPIObject {
* @return records of all objects
*/
public static Map<VMAppliance, VMAppliance.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_appliance.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVMApplianceVMApplianceRecord(result);
+ return Types.toMapOfVMApplianceVMApplianceRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VMGuestMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VMGuestMetrics.java b/deps/XenServerJava/src/com/xensource/xenapi/VMGuestMetrics.java
index 08d88e3..024f6c4 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VMGuestMetrics.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VMGuestMetrics.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VMGuestMetrics extends XenAPIObject {
* For internal use only.
*/
VMGuestMetrics(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VMGuestMetrics extends XenAPIObject {
{
if (obj != null && obj instanceof VMGuestMetrics)
{
- VMGuestMetrics other = (VMGuestMetrics)obj;
+ VMGuestMetrics other = (VMGuestMetrics) obj;
return other.ref.equals(this.ref);
} else
{
@@ -116,8 +117,8 @@ public class VMGuestMetrics extends XenAPIObject {
/**
* Convert a VM_guest_metrics.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("os_version", this.osVersion == null ? new HashMap<String, String>() : this.osVersion);
map.put("PV_drivers_version", this.PVDriversVersion == null ? new HashMap<String, String>() : this.PVDriversVersion);
@@ -184,15 +185,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return all fields from the object
*/
public VMGuestMetrics.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMGuestMetricsRecord(result);
+ return Types.toVMGuestMetricsRecord(result);
}
/**
@@ -202,15 +203,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return reference to the object
*/
public static VMGuestMetrics getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMGuestMetrics(result);
+ return Types.toVMGuestMetrics(result);
}
/**
@@ -219,15 +220,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -236,15 +237,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOsVersion(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_os_version";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -253,15 +254,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getPVDriversVersion(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_PV_drivers_version";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -270,15 +271,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public Boolean getPVDriversUpToDate(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_PV_drivers_up_to_date";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -287,15 +288,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getMemory(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_memory";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -304,15 +305,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getDisks(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_disks";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -321,15 +322,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getNetworks(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_networks";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -338,15 +339,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOther(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_other";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -355,15 +356,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public Date getLastUpdated(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_last_updated";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -372,15 +373,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -389,15 +390,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return value of the field
*/
public Boolean getLive(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_live";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -406,9 +407,9 @@ public class VMGuestMetrics extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -423,9 +424,9 @@ public class VMGuestMetrics extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -439,9 +440,9 @@ public class VMGuestMetrics extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -455,15 +456,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return references to all objects
*/
public static Set<VMGuestMetrics> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVMGuestMetrics(result);
+ return Types.toSetOfVMGuestMetrics(result);
}
/**
@@ -472,15 +473,15 @@ public class VMGuestMetrics extends XenAPIObject {
* @return records of all objects
*/
public static Map<VMGuestMetrics, VMGuestMetrics.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_guest_metrics.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVMGuestMetricsVMGuestMetricsRecord(result);
+ return Types.toMapOfVMGuestMetricsVMGuestMetricsRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VMMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VMMetrics.java b/deps/XenServerJava/src/com/xensource/xenapi/VMMetrics.java
index 5f9a7a4..30f4984 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VMMetrics.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VMMetrics.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VMMetrics extends XenAPIObject {
* For internal use only.
*/
VMMetrics(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VMMetrics extends XenAPIObject {
{
if (obj != null && obj instanceof VMMetrics)
{
- VMMetrics other = (VMMetrics)obj;
+ VMMetrics other = (VMMetrics) obj;
return other.ref.equals(this.ref);
} else
{
@@ -117,8 +118,8 @@ public class VMMetrics extends XenAPIObject {
/**
* Convert a VM_metrics.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("memory_actual", this.memoryActual == null ? 0 : this.memoryActual);
map.put("VCPUs_number", this.VCPUsNumber == null ? 0 : this.VCPUsNumber);
@@ -190,15 +191,15 @@ public class VMMetrics extends XenAPIObject {
* @return all fields from the object
*/
public VMMetrics.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMMetricsRecord(result);
+ return Types.toVMMetricsRecord(result);
}
/**
@@ -208,15 +209,15 @@ public class VMMetrics extends XenAPIObject {
* @return reference to the object
*/
public static VMMetrics getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMMetrics(result);
+ return Types.toVMMetrics(result);
}
/**
@@ -225,15 +226,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -242,15 +243,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Long getMemoryActual(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_memory_actual";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -259,15 +260,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Long getVCPUsNumber(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_VCPUs_number";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -276,15 +277,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<Long, Double> getVCPUsUtilisation(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_VCPUs_utilisation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfLongDouble(result);
+ return Types.toMapOfLongDouble(result);
}
/**
@@ -293,15 +294,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<Long, Long> getVCPUsCPU(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_VCPUs_CPU";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfLongLong(result);
+ return Types.toMapOfLongLong(result);
}
/**
@@ -310,15 +311,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getVCPUsParams(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_VCPUs_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -327,15 +328,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<Long, Set<String>> getVCPUsFlags(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_VCPUs_flags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfLongSetOfString(result);
+ return Types.toMapOfLongSetOfString(result);
}
/**
@@ -344,15 +345,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Set<String> getState(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_state";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -361,15 +362,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Date getStartTime(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_start_time";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -378,15 +379,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Date getInstallTime(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_install_time";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -395,15 +396,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Date getLastUpdated(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_last_updated";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -412,15 +413,15 @@ public class VMMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -429,9 +430,9 @@ public class VMMetrics extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -446,9 +447,9 @@ public class VMMetrics extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -462,9 +463,9 @@ public class VMMetrics extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -478,15 +479,15 @@ public class VMMetrics extends XenAPIObject {
* @return references to all objects
*/
public static Set<VMMetrics> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVMMetrics(result);
+ return Types.toSetOfVMMetrics(result);
}
/**
@@ -495,15 +496,15 @@ public class VMMetrics extends XenAPIObject {
* @return records of all objects
*/
public static Map<VMMetrics, VMMetrics.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM_metrics.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVMMetricsVMMetricsRecord(result);
+ return Types.toMapOfVMMetricsVMMetricsRecord(result);
}
}
\ No newline at end of file
[45/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
CLOUDSTACK-6146. [VMware] [ESXi 5.5] Live VM migration of an already migrated VM (with storage) across clusters fails
In vCenter 5.5, once a volume is migrated the VMDKs are renamed to match the name of the VM.
Update volume path for every volume belonging to the VM to the corresponding new disk filename.
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/88b57616
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/88b57616
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/88b57616
Branch: refs/heads/acl-item-cidrs
Commit: 88b576164789391430d779af74ed3a7ee3be87fb
Parents: 0926bf5
Author: Likitha Shetty <li...@citrix.com>
Authored: Tue Feb 25 18:10:52 2014 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Wed Feb 26 13:45:44 2014 +0530
----------------------------------------------------------------------
.../vmware/resource/VmwareResource.java | 25 ++++++++++++--
.../motion/VmwareStorageMotionStrategy.java | 36 +++++++++++++-------
2 files changed, 45 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88b57616/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 3b631ac..9e12105 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2988,6 +2988,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
VolumeTO volume;
StorageFilerTO filerTo;
Set<String> mountedDatastoresAtSource = new HashSet<String>();
+ List<VolumeObjectTO> volumeToList = new ArrayList<VolumeObjectTO>();
+ Map<Long, Integer> volumeDeviceKey = new HashMap<Long, Integer>();
Map<VolumeTO, StorageFilerTO> volToFiler = cmd.getVolumeToFiler();
String tgtHost = cmd.getTargetHost();
@@ -3049,9 +3051,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
".vmdk");
diskLocator = new VirtualMachineRelocateSpecDiskLocator();
diskLocator.setDatastore(morDsAtSource);
- diskLocator.setDiskId(getVirtualDiskInfo(vmMo, volume.getPath() + ".vmdk"));
+ int diskId = getVirtualDiskInfo(vmMo, volume.getPath() + ".vmdk");
+ diskLocator.setDiskId(diskId);
diskLocators.add(diskLocator);
+ volumeDeviceKey.put(volume.getId(), diskId);
}
relocateSpec.getDisk().addAll(diskLocators);
@@ -3083,6 +3087,22 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
s_logger.debug("Successfully migrated storage of VM " + vmName + " to target datastore(s)");
}
+ // Update and return volume path for every disk because that could have changed after migration
+ for (Entry<VolumeTO, StorageFilerTO> entry : volToFiler.entrySet()) {
+ volume = entry.getKey();
+ long volumeId = volume.getId();
+ VirtualDisk[] disks = vmMo.getAllDiskDevice();
+ for (VirtualDisk disk : disks) {
+ if (volumeDeviceKey.get(volumeId) == disk.getKey()) {
+ VolumeObjectTO newVol = new VolumeObjectTO();
+ newVol.setId(volumeId);
+ newVol.setPath(vmMo.getVmdkFileBaseName(disk));
+ volumeToList.add(newVol);
+ break;
+ }
+ }
+ }
+
// Change host
ManagedObjectReference morPool = tgtHyperHost.getHyperHostOwnerResourcePool();
if (!vmMo.migrate(morPool, tgtHyperHost.getMor())) {
@@ -3092,7 +3112,6 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
}
state = State.Stopping;
- List<VolumeObjectTO> volumeToList = null;
return new MigrateWithStorageAnswer(cmd, volumeToList);
} catch (Throwable e) {
if (e instanceof RemoteException) {
@@ -3198,7 +3217,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
}
private int getVirtualDiskInfo(VirtualMachineMO vmMo, String srcDiskName) throws Exception {
- Pair<VirtualDisk, String> deviceInfo = vmMo.getDiskDevice(srcDiskName, false);
+ Pair<VirtualDisk, String> deviceInfo = vmMo.getDiskDevice(srcDiskName, true);
if (deviceInfo == null) {
throw new Exception("No such disk device: " + srcDiskName);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88b57616/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java
index e1527f9..09f1068 100644
--- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java
+++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java
@@ -20,6 +20,7 @@
package org.apache.cloudstack.storage.motion;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.inject.Inject;
@@ -36,6 +37,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
@@ -145,7 +147,7 @@ public class VmwareStorageMotionStrategy implements DataMotionStrategy {
throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost + ". " + migrateWithStorageAnswer.getDetails());
} else {
// Update the volume details after migration.
- updateVolumesAfterMigration(volumeToPool);
+ updateVolumesAfterMigration(volumeToPool, migrateWithStorageAnswer.getVolumeTos());
}
s_logger.debug("Storage migration of VM " + vm.getInstanceName() + " completed successfully. Migrated to host " + destHost.getName());
@@ -179,7 +181,7 @@ public class VmwareStorageMotionStrategy implements DataMotionStrategy {
throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost + ". " + answer.getDetails());
} else {
// Update the volume details after migration.
- updateVolumesAfterMigration(volumeToPool);
+ updateVolumesAfterMigration(volumeToPool, answer.getVolumeTos());
}
return answer;
@@ -189,20 +191,28 @@ public class VmwareStorageMotionStrategy implements DataMotionStrategy {
}
}
- private void updateVolumesAfterMigration(Map<VolumeInfo, DataStore> volumeToPool) {
+ private void updateVolumesAfterMigration(Map<VolumeInfo, DataStore> volumeToPool, List<VolumeObjectTO> volumeTos) {
for (Map.Entry<VolumeInfo, DataStore> entry : volumeToPool.entrySet()) {
+ boolean updated = false;
VolumeInfo volume = entry.getKey();
StoragePool pool = (StoragePool)entry.getValue();
-
- VolumeVO volumeVO = volDao.findById(volume.getId());
- Long oldPoolId = volumeVO.getPoolId();
- volumeVO.setLastPoolId(oldPoolId);
- volumeVO.setFolder(pool.getPath());
- volumeVO.setPodId(pool.getPodId());
- volumeVO.setPoolId(pool.getId());
-
- volDao.update(volume.getId(), volumeVO);
- s_logger.debug("Volume path was successfully updated for volume " + volume.getName() + " after it was migrated.");
+ for (VolumeObjectTO volumeTo : volumeTos) {
+ if (volume.getId() == volumeTo.getId()) {
+ VolumeVO volumeVO = volDao.findById(volume.getId());
+ Long oldPoolId = volumeVO.getPoolId();
+ volumeVO.setPath(volumeTo.getPath());
+ volumeVO.setLastPoolId(oldPoolId);
+ volumeVO.setFolder(pool.getPath());
+ volumeVO.setPodId(pool.getPodId());
+ volumeVO.setPoolId(pool.getId());
+ volDao.update(volume.getId(), volumeVO);
+ updated = true;
+ break;
+ }
+ }
+ if (!updated) {
+ s_logger.error("Volume path wasn't updated for volume " + volume + " after it was migrated.");
+ }
}
}
}
[09/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Types.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Types.java b/deps/XenServerJava/src/com/xensource/xenapi/Types.java
index 777d580..50f49a0 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Types.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Types.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import java.util.Date;
@@ -44,7 +45,7 @@ import org.apache.xmlrpc.XmlRpcException;
/**
* This class holds vital marshalling functions, enum types and exceptions.
- *
+ *
* @author Citrix Systems, Inc.
*/
public class Types
@@ -68,7 +69,7 @@ public class Types
String[] result = new String[objArray.length];
for (int i = 0; i < objArray.length; i++)
{
- result[i] = (String)objArray[i];
+ result[i] = (String) objArray[i];
}
return result;
}
@@ -118,7 +119,6 @@ public class Types
return sb.toString();
}
}
-
/**
* Thrown if the response from the server contains an invalid status.
*/
@@ -126,7 +126,7 @@ public class Types
{
public BadServerResponse(Map response)
{
- super(ObjectArrayToStringArray((Object[])response.get("ErrorDescription")));
+ super(ObjectArrayToStringArray((Object[]) response.get("ErrorDescription")));
}
}
@@ -144,9 +144,7 @@ public class Types
/*
* A call has been made which should not be made against this version of host.
* Probably the host is out of date and cannot handle this call, or is
- * unable to comply with the details of the call. For instance SR.create
- * on Miami (4.1) hosts takes an smConfig parameter, which must be an empty map
- * when making this call on Rio (4.0) hosts.
+ * unable to comply with the details of the call.
*/
public static class VersionException extends XenAPIException
{
@@ -172,11 +170,10 @@ public class Types
return matcher.group(1);
}
-
- /**
- * Checks the provided server response was successful. If the call failed, throws a XenAPIException. If the server
- * returned an invalid response, throws a BadServerResponse. Otherwise, returns the server response as passed in.
- */
+ /**
+ * Checks the provided server response was successful. If the call failed, throws a XenAPIException. If the server
+ * returned an invalid response, throws a BadServerResponse. Otherwise, returns the server response as passed in.
+ */
static Map checkResponse(Map response) throws XenAPIException, BadServerResponse
{
if (response.get("Status").equals("Success"))
@@ -186,623 +183,628 @@ public class Types
if (response.get("Status").equals("Failure"))
{
- String[] ErrorDescription = ObjectArrayToStringArray((Object[])response.get("ErrorDescription"));
+ String[] ErrorDescription = ObjectArrayToStringArray((Object[]) response.get("ErrorDescription"));
- if (ErrorDescription[0].equals("RESTORE_TARGET_MISSING_DEVICE"))
+ if (ErrorDescription[0].equals("CANNOT_DESTROY_DISASTER_RECOVERY_TASK"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.RestoreTargetMissingDevice(p1);
+ throw new Types.CannotDestroyDisasterRecoveryTask(p1);
}
- if (ErrorDescription[0].equals("WLB_TIMEOUT"))
+ if (ErrorDescription[0].equals("IMPORT_ERROR_ATTACHED_DISKS_NOT_FOUND"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.WlbTimeout(p1);
+ throw new Types.ImportErrorAttachedDisksNotFound();
}
- if (ErrorDescription[0].equals("MAC_DOES_NOT_EXIST"))
+ if (ErrorDescription[0].equals("COULD_NOT_IMPORT_DATABASE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.MacDoesNotExist(p1);
+ throw new Types.CouldNotImportDatabase(p1);
}
- if (ErrorDescription[0].equals("HANDLE_INVALID"))
+ if (ErrorDescription[0].equals("HOST_CANNOT_ATTACH_NETWORK"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.HandleInvalid(p1, p2);
- }
- if (ErrorDescription[0].equals("DEVICE_ALREADY_ATTACHED"))
- {
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.DeviceAlreadyAttached(p1);
+ throw new Types.HostCannotAttachNetwork(p1, p2);
}
- if (ErrorDescription[0].equals("INVALID_IP_ADDRESS_SPECIFIED"))
+ if (ErrorDescription[0].equals("VM_INCOMPATIBLE_WITH_THIS_HOST"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.InvalidIpAddressSpecified(p1);
- }
- if (ErrorDescription[0].equals("SR_NOT_EMPTY"))
- {
- throw new Types.SrNotEmpty();
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.VmIncompatibleWithThisHost(p1, p2, p3);
}
- if (ErrorDescription[0].equals("VM_HVM_REQUIRED"))
+ if (ErrorDescription[0].equals("SESSION_INVALID"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmHvmRequired(p1);
+ throw new Types.SessionInvalid(p1);
}
- if (ErrorDescription[0].equals("GPU_GROUP_CONTAINS_PGPU"))
+ if (ErrorDescription[0].equals("XEN_VSS_REQ_ERROR_CREATING_SNAPSHOT"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.GpuGroupContainsPgpu(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.XenVssReqErrorCreatingSnapshot(p1, p2);
}
- if (ErrorDescription[0].equals("PIF_TUNNEL_STILL_EXISTS"))
+ if (ErrorDescription[0].equals("VM_REVERT_FAILED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.PifTunnelStillExists(p1);
- }
- if (ErrorDescription[0].equals("PIF_BOND_NEEDS_MORE_MEMBERS"))
- {
- throw new Types.PifBondNeedsMoreMembers();
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.VmRevertFailed(p1, p2);
}
- if (ErrorDescription[0].equals("PIF_ALREADY_BONDED"))
+ if (ErrorDescription[0].equals("CPU_FEATURE_MASKING_NOT_SUPPORTED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.PifAlreadyBonded(p1);
+ throw new Types.CpuFeatureMaskingNotSupported(p1);
}
- if (ErrorDescription[0].equals("CANNOT_DESTROY_DISASTER_RECOVERY_TASK"))
+ if (ErrorDescription[0].equals("HA_LOST_STATEFILE"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.CannotDestroyDisasterRecoveryTask(p1);
+ throw new Types.HaLostStatefile();
}
- if (ErrorDescription[0].equals("VLAN_TAG_INVALID"))
+ if (ErrorDescription[0].equals("VM_CANNOT_DELETE_DEFAULT_TEMPLATE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VlanTagInvalid(p1);
+ throw new Types.VmCannotDeleteDefaultTemplate(p1);
}
- if (ErrorDescription[0].equals("HOST_IS_SLAVE"))
+ if (ErrorDescription[0].equals("AUTH_ENABLE_FAILED_PERMISSION_DENIED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HostIsSlave(p1);
+ throw new Types.AuthEnableFailedPermissionDenied(p1);
}
- if (ErrorDescription[0].equals("SR_HAS_MULTIPLE_PBDS"))
+ if (ErrorDescription[0].equals("TOO_BUSY"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SrHasMultiplePbds(p1);
+ throw new Types.TooBusy();
}
- if (ErrorDescription[0].equals("POOL_AUTH_ENABLE_FAILED_INVALID_OU"))
+ if (ErrorDescription[0].equals("BACKUP_SCRIPT_FAILED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.PoolAuthEnableFailedInvalidOu(p1, p2);
- }
- if (ErrorDescription[0].equals("IMPORT_ERROR_SOME_CHECKSUMS_FAILED"))
- {
- throw new Types.ImportErrorSomeChecksumsFailed();
+ throw new Types.BackupScriptFailed(p1);
}
- if (ErrorDescription[0].equals("OPENVSWITCH_NOT_ACTIVE"))
+ if (ErrorDescription[0].equals("HOST_NOT_LIVE"))
{
- throw new Types.OpenvswitchNotActive();
+ throw new Types.HostNotLive();
}
- if (ErrorDescription[0].equals("CANNOT_FIND_OEM_BACKUP_PARTITION"))
+ if (ErrorDescription[0].equals("LICENSE_EXPIRED"))
{
- throw new Types.CannotFindOemBackupPartition();
+ throw new Types.LicenseExpired();
}
- if (ErrorDescription[0].equals("PIF_DEVICE_NOT_FOUND"))
+ if (ErrorDescription[0].equals("VM_REQUIRES_NETWORK"))
{
- throw new Types.PifDeviceNotFound();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.VmRequiresNetwork(p1, p2);
}
- if (ErrorDescription[0].equals("DOMAIN_BUILDER_ERROR"))
+ if (ErrorDescription[0].equals("LOCATION_NOT_UNIQUE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- throw new Types.DomainBuilderError(p1, p2, p3);
+ throw new Types.LocationNotUnique(p1, p2);
}
- if (ErrorDescription[0].equals("PATCH_PRECHECK_FAILED_VM_RUNNING"))
+ if (ErrorDescription[0].equals("VGPU_TYPE_NOT_SUPPORTED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.PatchPrecheckFailedVmRunning(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.VgpuTypeNotSupported(p1, p2);
}
- if (ErrorDescription[0].equals("VM_REQUIRES_IOMMU"))
+ if (ErrorDescription[0].equals("HOST_HAS_NO_MANAGEMENT_IP"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmRequiresIommu(p1);
+ throw new Types.HostHasNoManagementIp();
}
- if (ErrorDescription[0].equals("HA_HOST_CANNOT_SEE_PEERS"))
+ if (ErrorDescription[0].equals("XEN_VSS_REQ_ERROR_CREATING_SNAPSHOT_XML_STRING"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- throw new Types.HaHostCannotSeePeers(p1, p2, p3);
+ throw new Types.XenVssReqErrorCreatingSnapshotXmlString(p1, p2);
}
- if (ErrorDescription[0].equals("POOL_AUTH_DISABLE_FAILED_PERMISSION_DENIED"))
+ if (ErrorDescription[0].equals("CANNOT_PLUG_BOND_SLAVE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.PoolAuthDisableFailedPermissionDenied(p1, p2);
+ throw new Types.CannotPlugBondSlave(p1);
}
- if (ErrorDescription[0].equals("PERMISSION_DENIED"))
+ if (ErrorDescription[0].equals("VGPU_TYPE_NOT_ENABLED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.PermissionDenied(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.VgpuTypeNotEnabled(p1, p2);
}
- if (ErrorDescription[0].equals("SSL_VERIFY_ERROR"))
+ if (ErrorDescription[0].equals("CANNOT_FIND_OEM_BACKUP_PARTITION"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SslVerifyError(p1);
+ throw new Types.CannotFindOemBackupPartition();
}
- if (ErrorDescription[0].equals("SR_ATTACH_FAILED"))
+ if (ErrorDescription[0].equals("PIF_ALREADY_BONDED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SrAttachFailed(p1);
+ throw new Types.PifAlreadyBonded(p1);
}
- if (ErrorDescription[0].equals("SUBJECT_ALREADY_EXISTS"))
+ if (ErrorDescription[0].equals("RESTORE_INCOMPATIBLE_VERSION"))
{
- throw new Types.SubjectAlreadyExists();
+ throw new Types.RestoreIncompatibleVersion();
}
- if (ErrorDescription[0].equals("HA_LOST_STATEFILE"))
+ if (ErrorDescription[0].equals("SESSION_AUTHENTICATION_FAILED"))
{
- throw new Types.HaLostStatefile();
+ throw new Types.SessionAuthenticationFailed();
}
- if (ErrorDescription[0].equals("HA_NOT_ENABLED"))
+ if (ErrorDescription[0].equals("PIF_BOND_NEEDS_MORE_MEMBERS"))
{
- throw new Types.HaNotEnabled();
+ throw new Types.PifBondNeedsMoreMembers();
}
if (ErrorDescription[0].equals("HA_HEARTBEAT_DAEMON_STARTUP_FAILED"))
{
throw new Types.HaHeartbeatDaemonStartupFailed();
}
- if (ErrorDescription[0].equals("SESSION_NOT_REGISTERED"))
+ if (ErrorDescription[0].equals("INVALID_VALUE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SessionNotRegistered(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.InvalidValue(p1, p2);
}
- if (ErrorDescription[0].equals("VM_NO_SUSPEND_SR"))
+ if (ErrorDescription[0].equals("INVALID_IP_ADDRESS_SPECIFIED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmNoSuspendSr(p1);
+ throw new Types.InvalidIpAddressSpecified(p1);
}
- if (ErrorDescription[0].equals("VM_HAS_TOO_MANY_SNAPSHOTS"))
+ if (ErrorDescription[0].equals("LICENSE_CANNOT_DOWNGRADE_WHILE_IN_POOL"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmHasTooManySnapshots(p1);
+ throw new Types.LicenseCannotDowngradeWhileInPool();
}
- if (ErrorDescription[0].equals("PATCH_APPLY_FAILED"))
+ if (ErrorDescription[0].equals("VMS_FAILED_TO_COOPERATE"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.PatchApplyFailed(p1);
+ throw new Types.VmsFailedToCooperate();
}
- if (ErrorDescription[0].equals("VDI_READONLY"))
+ if (ErrorDescription[0].equals("HOST_DISABLED_UNTIL_REBOOT"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VdiReadonly(p1);
+ throw new Types.HostDisabledUntilReboot(p1);
}
- if (ErrorDescription[0].equals("SR_FULL"))
+ if (ErrorDescription[0].equals("SYSTEM_STATUS_RETRIEVAL_FAILED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.SrFull(p1, p2);
+ throw new Types.SystemStatusRetrievalFailed(p1);
}
- if (ErrorDescription[0].equals("VM_REQUIRES_GPU"))
+ if (ErrorDescription[0].equals("PIF_INCOMPATIBLE_PRIMARY_ADDRESS_TYPE"))
+ {
+ throw new Types.PifIncompatiblePrimaryAddressType();
+ }
+ if (ErrorDescription[0].equals("IMPORT_ERROR_PREMATURE_EOF"))
+ {
+ throw new Types.ImportErrorPrematureEof();
+ }
+ if (ErrorDescription[0].equals("PROVISION_ONLY_ALLOWED_ON_TEMPLATE"))
+ {
+ throw new Types.ProvisionOnlyAllowedOnTemplate();
+ }
+ if (ErrorDescription[0].equals("VBD_NOT_REMOVABLE_MEDIA"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.VmRequiresGpu(p1, p2);
+ throw new Types.VbdNotRemovableMedia(p1);
}
- if (ErrorDescription[0].equals("VDI_NOT_AVAILABLE"))
+ if (ErrorDescription[0].equals("GPU_GROUP_CONTAINS_NO_PGPUS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VdiNotAvailable(p1);
+ throw new Types.GpuGroupContainsNoPgpus(p1);
}
- if (ErrorDescription[0].equals("XMLRPC_UNMARSHAL_FAILURE"))
+ if (ErrorDescription[0].equals("HA_HOST_CANNOT_SEE_PEERS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.XmlrpcUnmarshalFailure(p1, p2);
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.HaHostCannotSeePeers(p1, p2, p3);
}
- if (ErrorDescription[0].equals("CRL_ALREADY_EXISTS"))
+ if (ErrorDescription[0].equals("AUTH_ENABLE_FAILED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.CrlAlreadyExists(p1);
+ throw new Types.AuthEnableFailed(p1);
}
- if (ErrorDescription[0].equals("HOST_MASTER_CANNOT_TALK_BACK"))
+ if (ErrorDescription[0].equals("HOST_NAME_INVALID"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HostMasterCannotTalkBack(p1);
+ throw new Types.HostNameInvalid(p1);
}
- if (ErrorDescription[0].equals("XAPI_HOOK_FAILED"))
+ if (ErrorDescription[0].equals("WLB_XENSERVER_CONNECTION_REFUSED"))
+ {
+ throw new Types.WlbXenserverConnectionRefused();
+ }
+ if (ErrorDescription[0].equals("XEN_VSS_REQ_ERROR_NO_VOLUMES_SUPPORTED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- String p4 = ErrorDescription.length > 4 ? ErrorDescription[4] : "";
- throw new Types.XapiHookFailed(p1, p2, p3, p4);
+ throw new Types.XenVssReqErrorNoVolumesSupported(p1, p2);
}
- if (ErrorDescription[0].equals("IMPORT_INCOMPATIBLE_VERSION"))
+ if (ErrorDescription[0].equals("HOST_NOT_ENOUGH_FREE_MEMORY"))
{
- throw new Types.ImportIncompatibleVersion();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.HostNotEnoughFreeMemory(p1, p2);
}
- if (ErrorDescription[0].equals("UNKNOWN_BOOTLOADER"))
+ if (ErrorDescription[0].equals("CANNOT_EVACUATE_HOST"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.UnknownBootloader(p1, p2);
+ throw new Types.CannotEvacuateHost(p1);
}
- if (ErrorDescription[0].equals("XEN_VSS_REQ_ERROR_PROV_NOT_LOADED"))
+ if (ErrorDescription[0].equals("VM_IS_PART_OF_AN_APPLIANCE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.XenVssReqErrorProvNotLoaded(p1, p2);
+ throw new Types.VmIsPartOfAnAppliance(p1, p2);
}
- if (ErrorDescription[0].equals("FEATURE_REQUIRES_HVM"))
+ if (ErrorDescription[0].equals("VDI_IS_A_PHYSICAL_DEVICE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.FeatureRequiresHvm(p1);
+ throw new Types.VdiIsAPhysicalDevice(p1);
}
if (ErrorDescription[0].equals("SR_VDI_LOCKING_FAILED"))
{
throw new Types.SrVdiLockingFailed();
}
- if (ErrorDescription[0].equals("PIF_IS_PHYSICAL"))
+ if (ErrorDescription[0].equals("PIF_VLAN_EXISTS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.PifIsPhysical(p1);
+ throw new Types.PifVlanExists(p1);
}
- if (ErrorDescription[0].equals("MAP_DUPLICATE_KEY"))
+ if (ErrorDescription[0].equals("HOSTS_NOT_COMPATIBLE"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- String p4 = ErrorDescription.length > 4 ? ErrorDescription[4] : "";
- throw new Types.MapDuplicateKey(p1, p2, p3, p4);
+ throw new Types.HostsNotCompatible();
}
- if (ErrorDescription[0].equals("MISSING_CONNECTION_DETAILS"))
+ if (ErrorDescription[0].equals("VM_IS_PROTECTED"))
{
- throw new Types.MissingConnectionDetails();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.VmIsProtected(p1);
}
- if (ErrorDescription[0].equals("XEN_VSS_REQ_ERROR_CREATING_SNAPSHOT_XML_STRING"))
+ if (ErrorDescription[0].equals("HA_POOL_IS_ENABLED_BUT_HOST_IS_DISABLED"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.XenVssReqErrorCreatingSnapshotXmlString(p1, p2);
+ throw new Types.HaPoolIsEnabledButHostIsDisabled();
}
- if (ErrorDescription[0].equals("BOOTLOADER_FAILED"))
+ if (ErrorDescription[0].equals("V6D_FAILURE"))
+ {
+ throw new Types.V6dFailure();
+ }
+ if (ErrorDescription[0].equals("DEVICE_DETACH_TIMEOUT"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.BootloaderFailed(p1, p2);
+ throw new Types.DeviceDetachTimeout(p1, p2);
}
- if (ErrorDescription[0].equals("WLB_XENSERVER_MALFORMED_RESPONSE"))
+ if (ErrorDescription[0].equals("LICENSE_PROCESSING_ERROR"))
{
- throw new Types.WlbXenserverMalformedResponse();
+ throw new Types.LicenseProcessingError();
}
- if (ErrorDescription[0].equals("GPU_GROUP_CONTAINS_VGPU"))
+ if (ErrorDescription[0].equals("PIF_VLAN_STILL_EXISTS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.GpuGroupContainsVgpu(p1);
+ throw new Types.PifVlanStillExists(p1);
}
- if (ErrorDescription[0].equals("POOL_AUTH_ENABLE_FAILED_DUPLICATE_HOSTNAME"))
+ if (ErrorDescription[0].equals("VM_REBOOTED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.PoolAuthEnableFailedDuplicateHostname(p1, p2);
+ throw new Types.VmRebooted(p1);
}
- if (ErrorDescription[0].equals("SYSTEM_STATUS_RETRIEVAL_FAILED"))
+ if (ErrorDescription[0].equals("OBJECT_NOLONGER_EXISTS"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SystemStatusRetrievalFailed(p1);
+ throw new Types.ObjectNolongerExists();
}
- if (ErrorDescription[0].equals("VDI_IN_USE"))
+ if (ErrorDescription[0].equals("CERTIFICATE_LIBRARY_CORRUPT"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.VdiInUse(p1, p2);
+ throw new Types.CertificateLibraryCorrupt();
}
- if (ErrorDescription[0].equals("HOST_NOT_LIVE"))
+ if (ErrorDescription[0].equals("DUPLICATE_VM"))
{
- throw new Types.HostNotLive();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.DuplicateVm(p1);
}
if (ErrorDescription[0].equals("CERTIFICATE_ALREADY_EXISTS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
throw new Types.CertificateAlreadyExists(p1);
}
- if (ErrorDescription[0].equals("SR_HAS_NO_PBDS"))
+ if (ErrorDescription[0].equals("CERTIFICATE_CORRUPT"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SrHasNoPbds(p1);
+ throw new Types.CertificateCorrupt(p1);
}
- if (ErrorDescription[0].equals("CANNOT_ADD_TUNNEL_TO_BOND_SLAVE"))
+ if (ErrorDescription[0].equals("SM_PLUGIN_COMMUNICATION_FAILURE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.CannotAddTunnelToBondSlave(p1);
+ throw new Types.SmPluginCommunicationFailure(p1);
}
- if (ErrorDescription[0].equals("INVALID_PATCH"))
+ if (ErrorDescription[0].equals("WLB_DISABLED"))
{
- throw new Types.InvalidPatch();
+ throw new Types.WlbDisabled();
}
- if (ErrorDescription[0].equals("SR_INDESTRUCTIBLE"))
+ if (ErrorDescription[0].equals("GPU_GROUP_CONTAINS_PGPU"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SrIndestructible(p1);
+ throw new Types.GpuGroupContainsPgpu(p1);
}
- if (ErrorDescription[0].equals("HA_ABORT_NEW_MASTER"))
+ if (ErrorDescription[0].equals("VDI_NOT_IN_MAP"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HaAbortNewMaster(p1);
+ throw new Types.VdiNotInMap(p1);
}
- if (ErrorDescription[0].equals("WLB_MALFORMED_RESPONSE"))
+ if (ErrorDescription[0].equals("LICENCE_RESTRICTION"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- throw new Types.WlbMalformedResponse(p1, p2, p3);
+ throw new Types.LicenceRestriction();
}
- if (ErrorDescription[0].equals("POOL_JOINING_HOST_MUST_HAVE_PHYSICAL_MANAGEMENT_NIC"))
+ if (ErrorDescription[0].equals("TOO_MANY_PENDING_TASKS"))
{
- throw new Types.PoolJoiningHostMustHavePhysicalManagementNic();
+ throw new Types.TooManyPendingTasks();
}
- if (ErrorDescription[0].equals("PIF_HAS_NO_V6_NETWORK_CONFIGURATION"))
+ if (ErrorDescription[0].equals("VM_SNAPSHOT_WITH_QUIESCE_TIMEOUT"))
{
- throw new Types.PifHasNoV6NetworkConfiguration();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.VmSnapshotWithQuiesceTimeout(p1);
}
- if (ErrorDescription[0].equals("VM_IS_PART_OF_AN_APPLIANCE"))
+ if (ErrorDescription[0].equals("VDI_INCOMPATIBLE_TYPE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.VmIsPartOfAnAppliance(p1, p2);
+ throw new Types.VdiIncompatibleType(p1, p2);
}
- if (ErrorDescription[0].equals("WLB_XENSERVER_AUTHENTICATION_FAILED"))
+ if (ErrorDescription[0].equals("VIF_IN_USE"))
{
- throw new Types.WlbXenserverAuthenticationFailed();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.VifInUse(p1, p2);
}
- if (ErrorDescription[0].equals("CANNOT_RESET_CONTROL_DOMAIN"))
+ if (ErrorDescription[0].equals("VMPP_ARCHIVE_MORE_FREQUENT_THAN_BACKUP"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.CannotResetControlDomain(p1);
+ throw new Types.VmppArchiveMoreFrequentThanBackup();
}
- if (ErrorDescription[0].equals("PATCH_PRECHECK_FAILED_UNKNOWN_ERROR"))
+ if (ErrorDescription[0].equals("IMPORT_INCOMPATIBLE_VERSION"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.PatchPrecheckFailedUnknownError(p1, p2);
+ throw new Types.ImportIncompatibleVersion();
}
- if (ErrorDescription[0].equals("HOST_CANNOT_ATTACH_NETWORK"))
+ if (ErrorDescription[0].equals("INVALID_EDITION"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.HostCannotAttachNetwork(p1, p2);
+ throw new Types.InvalidEdition(p1);
}
- if (ErrorDescription[0].equals("WLB_URL_INVALID"))
+ if (ErrorDescription[0].equals("AUTH_SERVICE_ERROR"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.WlbUrlInvalid(p1);
+ throw new Types.AuthServiceError(p1);
}
- if (ErrorDescription[0].equals("DUPLICATE_VM"))
+ if (ErrorDescription[0].equals("XEN_VSS_REQ_ERROR_ADDING_VOLUME_TO_SNAPSET_FAILED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.DuplicateVm(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.XenVssReqErrorAddingVolumeToSnapsetFailed(p1, p2);
}
- if (ErrorDescription[0].equals("HOST_CANNOT_DESTROY_SELF"))
+ if (ErrorDescription[0].equals("PERMISSION_DENIED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HostCannotDestroySelf(p1);
+ throw new Types.PermissionDenied(p1);
}
- if (ErrorDescription[0].equals("HOST_BROKEN"))
+ if (ErrorDescription[0].equals("DEVICE_ALREADY_EXISTS"))
{
- throw new Types.HostBroken();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.DeviceAlreadyExists(p1);
}
- if (ErrorDescription[0].equals("VM_CHECKPOINT_RESUME_FAILED"))
+ if (ErrorDescription[0].equals("SR_UUID_EXISTS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmCheckpointResumeFailed(p1);
+ throw new Types.SrUuidExists(p1);
}
- if (ErrorDescription[0].equals("VM_TOO_MANY_VCPUS"))
+ if (ErrorDescription[0].equals("VM_HAS_VGPU"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmTooManyVcpus(p1);
+ throw new Types.VmHasVgpu(p1);
}
- if (ErrorDescription[0].equals("HOST_IS_LIVE"))
+ if (ErrorDescription[0].equals("TOO_MANY_STORAGE_MIGRATES"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HostIsLive(p1);
+ throw new Types.TooManyStorageMigrates(p1);
}
- if (ErrorDescription[0].equals("IMPORT_ERROR_ATTACHED_DISKS_NOT_FOUND"))
+ if (ErrorDescription[0].equals("HA_IS_ENABLED"))
{
- throw new Types.ImportErrorAttachedDisksNotFound();
+ throw new Types.HaIsEnabled();
}
- if (ErrorDescription[0].equals("VBD_NOT_UNPLUGGABLE"))
+ if (ErrorDescription[0].equals("CANNOT_DESTROY_SYSTEM_NETWORK"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VbdNotUnpluggable(p1);
+ throw new Types.CannotDestroySystemNetwork(p1);
}
- if (ErrorDescription[0].equals("XEN_VSS_REQ_ERROR_CREATING_SNAPSHOT"))
+ if (ErrorDescription[0].equals("OPENVSWITCH_NOT_ACTIVE"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.XenVssReqErrorCreatingSnapshot(p1, p2);
+ throw new Types.OpenvswitchNotActive();
}
- if (ErrorDescription[0].equals("CANNOT_ENABLE_REDO_LOG"))
+ if (ErrorDescription[0].equals("NOT_IMPLEMENTED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.CannotEnableRedoLog(p1);
+ throw new Types.NotImplemented(p1);
}
- if (ErrorDescription[0].equals("CANNOT_EVACUATE_HOST"))
+ if (ErrorDescription[0].equals("VBD_NOT_UNPLUGGABLE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.CannotEvacuateHost(p1);
+ throw new Types.VbdNotUnpluggable(p1);
}
- if (ErrorDescription[0].equals("NO_HOSTS_AVAILABLE"))
+ if (ErrorDescription[0].equals("VM_CRASHED"))
{
- throw new Types.NoHostsAvailable();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.VmCrashed(p1);
}
- if (ErrorDescription[0].equals("DEVICE_ATTACH_TIMEOUT"))
+ if (ErrorDescription[0].equals("VM_BAD_POWER_STATE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.DeviceAttachTimeout(p1, p2);
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.VmBadPowerState(p1, p2, p3);
}
- if (ErrorDescription[0].equals("INVALID_DEVICE"))
+ if (ErrorDescription[0].equals("FEATURE_REQUIRES_HVM"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.InvalidDevice(p1);
+ throw new Types.FeatureRequiresHvm(p1);
}
- if (ErrorDescription[0].equals("PBD_EXISTS"))
+ if (ErrorDescription[0].equals("IMPORT_ERROR_UNEXPECTED_FILE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- throw new Types.PbdExists(p1, p2, p3);
+ throw new Types.ImportErrorUnexpectedFile(p1, p2);
}
- if (ErrorDescription[0].equals("WLB_XENSERVER_CONNECTION_REFUSED"))
+ if (ErrorDescription[0].equals("SR_NOT_EMPTY"))
{
- throw new Types.WlbXenserverConnectionRefused();
+ throw new Types.SrNotEmpty();
}
- if (ErrorDescription[0].equals("HOST_CANNOT_READ_METRICS"))
+ if (ErrorDescription[0].equals("JOINING_HOST_CANNOT_HAVE_VMS_WITH_CURRENT_OPERATIONS"))
{
- throw new Types.HostCannotReadMetrics();
+ throw new Types.JoiningHostCannotHaveVmsWithCurrentOperations();
}
- if (ErrorDescription[0].equals("VM_INCOMPATIBLE_WITH_THIS_HOST"))
+ if (ErrorDescription[0].equals("VDI_NOT_MANAGED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- throw new Types.VmIncompatibleWithThisHost(p1, p2, p3);
+ throw new Types.VdiNotManaged(p1);
}
- if (ErrorDescription[0].equals("NO_MORE_REDO_LOGS_ALLOWED"))
+ if (ErrorDescription[0].equals("VM_HALTED"))
{
- throw new Types.NoMoreRedoLogsAllowed();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.VmHalted(p1);
}
- if (ErrorDescription[0].equals("POOL_AUTH_ENABLE_FAILED"))
+ if (ErrorDescription[0].equals("COULD_NOT_FIND_NETWORK_INTERFACE_WITH_SPECIFIED_DEVICE_NAME_AND_MAC_ADDRESS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.PoolAuthEnableFailed(p1, p2);
+ throw new Types.CouldNotFindNetworkInterfaceWithSpecifiedDeviceNameAndMacAddress(p1, p2);
}
- if (ErrorDescription[0].equals("VM_SNAPSHOT_WITH_QUIESCE_NOT_SUPPORTED"))
+ if (ErrorDescription[0].equals("SR_BACKEND_FAILURE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.VmSnapshotWithQuiesceNotSupported(p1, p2);
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.SrBackendFailure(p1, p2, p3);
}
- if (ErrorDescription[0].equals("LICENSE_DOES_NOT_SUPPORT_POOLING"))
+ if (ErrorDescription[0].equals("RESTORE_TARGET_MISSING_DEVICE"))
{
- throw new Types.LicenseDoesNotSupportPooling();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.RestoreTargetMissingDevice(p1);
}
- if (ErrorDescription[0].equals("HOST_UNKNOWN_TO_MASTER"))
+ if (ErrorDescription[0].equals("VM_IS_TEMPLATE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HostUnknownToMaster(p1);
+ throw new Types.VmIsTemplate(p1);
}
- if (ErrorDescription[0].equals("WLB_CONNECTION_REFUSED"))
+ if (ErrorDescription[0].equals("HA_OPERATION_WOULD_BREAK_FAILOVER_PLAN"))
{
- throw new Types.WlbConnectionRefused();
+ throw new Types.HaOperationWouldBreakFailoverPlan();
}
- if (ErrorDescription[0].equals("VM_SNAPSHOT_WITH_QUIESCE_PLUGIN_DEOS_NOT_RESPOND"))
+ if (ErrorDescription[0].equals("VMPP_HAS_VM"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmSnapshotWithQuiescePluginDeosNotRespond(p1);
+ throw new Types.VmppHasVm();
}
- if (ErrorDescription[0].equals("VM_REQUIRES_SR"))
+ if (ErrorDescription[0].equals("HANDLE_INVALID"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.VmRequiresSr(p1, p2);
+ throw new Types.HandleInvalid(p1, p2);
}
- if (ErrorDescription[0].equals("VM_NO_CRASHDUMP_SR"))
+ if (ErrorDescription[0].equals("POOL_JOINING_HOST_MUST_HAVE_PHYSICAL_MANAGEMENT_NIC"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmNoCrashdumpSr(p1);
+ throw new Types.PoolJoiningHostMustHavePhysicalManagementNic();
}
- if (ErrorDescription[0].equals("HA_NOT_INSTALLED"))
+ if (ErrorDescription[0].equals("DEVICE_ALREADY_ATTACHED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HaNotInstalled(p1);
+ throw new Types.DeviceAlreadyAttached(p1);
}
- if (ErrorDescription[0].equals("DUPLICATE_PIF_DEVICE_NAME"))
+ if (ErrorDescription[0].equals("NOT_SUPPORTED_DURING_UPGRADE"))
+ {
+ throw new Types.NotSupportedDuringUpgrade();
+ }
+ if (ErrorDescription[0].equals("OPERATION_PARTIALLY_FAILED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.DuplicatePifDeviceName(p1);
+ throw new Types.OperationPartiallyFailed(p1);
}
- if (ErrorDescription[0].equals("VM_BAD_POWER_STATE"))
+ if (ErrorDescription[0].equals("OTHER_OPERATION_IN_PROGRESS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- throw new Types.VmBadPowerState(p1, p2, p3);
+ throw new Types.OtherOperationInProgress(p1, p2);
}
- if (ErrorDescription[0].equals("WLB_DISABLED"))
+ if (ErrorDescription[0].equals("PIF_CANNOT_BOND_CROSS_HOST"))
{
- throw new Types.WlbDisabled();
+ throw new Types.PifCannotBondCrossHost();
}
- if (ErrorDescription[0].equals("VM_HOST_INCOMPATIBLE_VERSION"))
+ if (ErrorDescription[0].equals("PATCH_PRECHECK_FAILED_WRONG_SERVER_VERSION"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.VmHostIncompatibleVersion(p1, p2);
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.PatchPrecheckFailedWrongServerVersion(p1, p2, p3);
}
- if (ErrorDescription[0].equals("POOL_JOINING_EXTERNAL_AUTH_MISMATCH"))
- {
- throw new Types.PoolJoiningExternalAuthMismatch();
- }
- if (ErrorDescription[0].equals("DISK_VBD_MUST_BE_READWRITE_FOR_HVM"))
+ if (ErrorDescription[0].equals("CANNOT_PLUG_VIF"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.DiskVbdMustBeReadwriteForHvm(p1);
+ throw new Types.CannotPlugVif(p1);
}
- if (ErrorDescription[0].equals("VM_BIOS_STRINGS_ALREADY_SET"))
+ if (ErrorDescription[0].equals("POOL_AUTH_ENABLE_FAILED_DOMAIN_LOOKUP_FAILED"))
{
- throw new Types.VmBiosStringsAlreadySet();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.PoolAuthEnableFailedDomainLookupFailed(p1, p2);
}
- if (ErrorDescription[0].equals("WLB_XENSERVER_UNKNOWN_HOST"))
+ if (ErrorDescription[0].equals("NOT_ALLOWED_ON_OEM_EDITION"))
{
- throw new Types.WlbXenserverUnknownHost();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.NotAllowedOnOemEdition(p1);
}
- if (ErrorDescription[0].equals("HA_HOST_CANNOT_ACCESS_STATEFILE"))
+ if (ErrorDescription[0].equals("PATCH_PRECHECK_FAILED_UNKNOWN_ERROR"))
{
- throw new Types.HaHostCannotAccessStatefile();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.PatchPrecheckFailedUnknownError(p1, p2);
}
- if (ErrorDescription[0].equals("VM_FAILED_SHUTDOWN_ACKNOWLEDGMENT"))
+ if (ErrorDescription[0].equals("CRL_CORRUPT"))
{
- throw new Types.VmFailedShutdownAcknowledgment();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.CrlCorrupt(p1);
}
- if (ErrorDescription[0].equals("AUTH_SERVICE_ERROR"))
+ if (ErrorDescription[0].equals("POOL_JOINING_EXTERNAL_AUTH_MISMATCH"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.AuthServiceError(p1);
+ throw new Types.PoolJoiningExternalAuthMismatch();
}
- if (ErrorDescription[0].equals("HOST_IN_EMERGENCY_MODE"))
+ if (ErrorDescription[0].equals("JOINING_HOST_SERVICE_FAILED"))
{
- throw new Types.HostInEmergencyMode();
+ throw new Types.JoiningHostServiceFailed();
}
- if (ErrorDescription[0].equals("HOST_DISABLED_UNTIL_REBOOT"))
+ if (ErrorDescription[0].equals("CHANGE_PASSWORD_REJECTED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HostDisabledUntilReboot(p1);
+ throw new Types.ChangePasswordRejected(p1);
}
- if (ErrorDescription[0].equals("DEFAULT_SR_NOT_FOUND"))
+ if (ErrorDescription[0].equals("PIF_UNMANAGED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.DefaultSrNotFound(p1);
+ throw new Types.PifUnmanaged(p1);
}
- if (ErrorDescription[0].equals("DEVICE_ALREADY_EXISTS"))
+ if (ErrorDescription[0].equals("VM_DUPLICATE_VBD_DEVICE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.DeviceAlreadyExists(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.VmDuplicateVbdDevice(p1, p2, p3);
}
- if (ErrorDescription[0].equals("SR_NOT_SHARABLE"))
+ if (ErrorDescription[0].equals("RESTORE_SCRIPT_FAILED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.SrNotSharable(p1, p2);
+ throw new Types.RestoreScriptFailed(p1);
}
- if (ErrorDescription[0].equals("VM_HAS_CHECKPOINT"))
+ if (ErrorDescription[0].equals("WLB_XENSERVER_TIMEOUT"))
+ {
+ throw new Types.WlbXenserverTimeout();
+ }
+ if (ErrorDescription[0].equals("MAC_DOES_NOT_EXIST"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmHasCheckpoint(p1);
+ throw new Types.MacDoesNotExist(p1);
}
- if (ErrorDescription[0].equals("SM_PLUGIN_COMMUNICATION_FAILURE"))
+ if (ErrorDescription[0].equals("HOST_ITS_OWN_SLAVE"))
+ {
+ throw new Types.HostItsOwnSlave();
+ }
+ if (ErrorDescription[0].equals("AUTH_DISABLE_FAILED_WRONG_CREDENTIALS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SmPluginCommunicationFailure(p1);
+ throw new Types.AuthDisableFailedWrongCredentials(p1);
+ }
+ if (ErrorDescription[0].equals("HA_TOO_FEW_HOSTS"))
+ {
+ throw new Types.HaTooFewHosts();
}
if (ErrorDescription[0].equals("VM_ASSIGNED_TO_PROTECTION_POLICY"))
{
@@ -810,244 +812,283 @@ public class Types
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
throw new Types.VmAssignedToProtectionPolicy(p1, p2);
}
- if (ErrorDescription[0].equals("RBAC_PERMISSION_DENIED"))
+ if (ErrorDescription[0].equals("MAP_DUPLICATE_KEY"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.RbacPermissionDenied(p1, p2);
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ String p4 = ErrorDescription.length > 4 ? ErrorDescription[4] : "";
+ throw new Types.MapDuplicateKey(p1, p2, p3, p4);
}
- if (ErrorDescription[0].equals("AUTH_DISABLE_FAILED_PERMISSION_DENIED"))
+ if (ErrorDescription[0].equals("HOST_MASTER_CANNOT_TALK_BACK"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.AuthDisableFailedPermissionDenied(p1);
+ throw new Types.HostMasterCannotTalkBack(p1);
}
- if (ErrorDescription[0].equals("LICENSE_CANNOT_DOWNGRADE_WHILE_IN_POOL"))
+ if (ErrorDescription[0].equals("VM_CHECKPOINT_RESUME_FAILED"))
{
- throw new Types.LicenseCannotDowngradeWhileInPool();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.VmCheckpointResumeFailed(p1);
}
- if (ErrorDescription[0].equals("TOO_MANY_PENDING_TASKS"))
+ if (ErrorDescription[0].equals("CRL_NAME_INVALID"))
{
- throw new Types.TooManyPendingTasks();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.CrlNameInvalid(p1);
}
- if (ErrorDescription[0].equals("VM_SNAPSHOT_WITH_QUIESCE_TIMEOUT"))
+ if (ErrorDescription[0].equals("EVENT_FROM_TOKEN_PARSE_FAILURE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmSnapshotWithQuiesceTimeout(p1);
+ throw new Types.EventFromTokenParseFailure(p1);
}
- if (ErrorDescription[0].equals("HA_CANNOT_CHANGE_BOND_STATUS_OF_MGMT_IFACE"))
+ if (ErrorDescription[0].equals("CANNOT_ENABLE_REDO_LOG"))
{
- throw new Types.HaCannotChangeBondStatusOfMgmtIface();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.CannotEnableRedoLog(p1);
}
- if (ErrorDescription[0].equals("PATCH_ALREADY_APPLIED"))
+ if (ErrorDescription[0].equals("PIF_DEVICE_NOT_FOUND"))
+ {
+ throw new Types.PifDeviceNotFound();
+ }
+ if (ErrorDescription[0].equals("LICENSE_DOES_NOT_SUPPORT_POOLING"))
+ {
+ throw new Types.LicenseDoesNotSupportPooling();
+ }
+ if (ErrorDescription[0].equals("OPERATION_BLOCKED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.PatchAlreadyApplied(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.OperationBlocked(p1, p2);
}
- if (ErrorDescription[0].equals("SR_UUID_EXISTS"))
+ if (ErrorDescription[0].equals("VM_NO_CRASHDUMP_SR"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SrUuidExists(p1);
+ throw new Types.VmNoCrashdumpSr(p1);
}
- if (ErrorDescription[0].equals("AUTH_ENABLE_FAILED_DOMAIN_LOOKUP_FAILED"))
+ if (ErrorDescription[0].equals("HOST_EVACUATE_IN_PROGRESS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.AuthEnableFailedDomainLookupFailed(p1);
+ throw new Types.HostEvacuateInProgress(p1);
}
- if (ErrorDescription[0].equals("PATCH_PRECHECK_FAILED_WRONG_SERVER_BUILD"))
+ if (ErrorDescription[0].equals("SYSTEM_STATUS_MUST_USE_TAR_ON_OEM"))
+ {
+ throw new Types.SystemStatusMustUseTarOnOem();
+ }
+ if (ErrorDescription[0].equals("HA_NO_PLAN"))
+ {
+ throw new Types.HaNoPlan();
+ }
+ if (ErrorDescription[0].equals("HOST_UNKNOWN_TO_MASTER"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- throw new Types.PatchPrecheckFailedWrongServerBuild(p1, p2, p3);
+ throw new Types.HostUnknownToMaster(p1);
}
- if (ErrorDescription[0].equals("INVALID_FEATURE_STRING"))
+ if (ErrorDescription[0].equals("AUTH_ENABLE_FAILED_WRONG_CREDENTIALS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.InvalidFeatureString(p1);
+ throw new Types.AuthEnableFailedWrongCredentials(p1);
}
- if (ErrorDescription[0].equals("WLB_NOT_INITIALIZED"))
+ if (ErrorDescription[0].equals("OPERATION_NOT_ALLOWED"))
{
- throw new Types.WlbNotInitialized();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.OperationNotAllowed(p1);
}
- if (ErrorDescription[0].equals("OPERATION_BLOCKED"))
+ if (ErrorDescription[0].equals("USER_IS_NOT_LOCAL_SUPERUSER"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.OperationBlocked(p1, p2);
+ throw new Types.UserIsNotLocalSuperuser(p1);
}
- if (ErrorDescription[0].equals("PROVISION_ONLY_ALLOWED_ON_TEMPLATE"))
+ if (ErrorDescription[0].equals("HA_FAILED_TO_FORM_LIVESET"))
{
- throw new Types.ProvisionOnlyAllowedOnTemplate();
+ throw new Types.HaFailedToFormLiveset();
}
- if (ErrorDescription[0].equals("VM_SHUTDOWN_TIMEOUT"))
+ if (ErrorDescription[0].equals("WLB_CONNECTION_RESET"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.VmShutdownTimeout(p1, p2);
+ throw new Types.WlbConnectionReset();
}
- if (ErrorDescription[0].equals("ROLE_ALREADY_EXISTS"))
+ if (ErrorDescription[0].equals("HOST_CD_DRIVE_EMPTY"))
{
- throw new Types.RoleAlreadyExists();
+ throw new Types.HostCdDriveEmpty();
}
- if (ErrorDescription[0].equals("NETWORK_CONTAINS_PIF"))
+ if (ErrorDescription[0].equals("EVENTS_LOST"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.NetworkContainsPif(p1);
+ throw new Types.EventsLost();
}
- if (ErrorDescription[0].equals("COULD_NOT_FIND_NETWORK_INTERFACE_WITH_SPECIFIED_DEVICE_NAME_AND_MAC_ADDRESS"))
+ if (ErrorDescription[0].equals("PROVISION_FAILED_OUT_OF_SPACE"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.CouldNotFindNetworkInterfaceWithSpecifiedDeviceNameAndMacAddress(p1, p2);
+ throw new Types.ProvisionFailedOutOfSpace();
}
- if (ErrorDescription[0].equals("JOINING_HOST_SERVICE_FAILED"))
+ if (ErrorDescription[0].equals("LICENSE_FILE_DEPRECATED"))
{
- throw new Types.JoiningHostServiceFailed();
+ throw new Types.LicenseFileDeprecated();
}
- if (ErrorDescription[0].equals("VDI_MISSING"))
+ if (ErrorDescription[0].equals("SUBJECT_ALREADY_EXISTS"))
+ {
+ throw new Types.SubjectAlreadyExists();
+ }
+ if (ErrorDescription[0].equals("VM_HOST_INCOMPATIBLE_VERSION"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.VdiMissing(p1, p2);
+ throw new Types.VmHostIncompatibleVersion(p1, p2);
}
- if (ErrorDescription[0].equals("VBD_TRAY_LOCKED"))
+ if (ErrorDescription[0].equals("HOST_BROKEN"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VbdTrayLocked(p1);
+ throw new Types.HostBroken();
}
- if (ErrorDescription[0].equals("POOL_AUTH_ENABLE_FAILED_PERMISSION_DENIED"))
+ if (ErrorDescription[0].equals("NOT_IN_EMERGENCY_MODE"))
+ {
+ throw new Types.NotInEmergencyMode();
+ }
+ if (ErrorDescription[0].equals("ROLE_NOT_FOUND"))
+ {
+ throw new Types.RoleNotFound();
+ }
+ if (ErrorDescription[0].equals("MAC_STILL_EXISTS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.PoolAuthEnableFailedPermissionDenied(p1, p2);
+ throw new Types.MacStillExists(p1);
}
- if (ErrorDescription[0].equals("UUID_INVALID"))
+ if (ErrorDescription[0].equals("HA_HOST_IS_ARMED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.UuidInvalid(p1, p2);
+ throw new Types.HaHostIsArmed(p1);
}
- if (ErrorDescription[0].equals("LICENCE_RESTRICTION"))
+ if (ErrorDescription[0].equals("JOINING_HOST_CANNOT_HAVE_RUNNING_VMS"))
{
- throw new Types.LicenceRestriction();
+ throw new Types.JoiningHostCannotHaveRunningVms();
}
- if (ErrorDescription[0].equals("VIF_IN_USE"))
+ if (ErrorDescription[0].equals("DOMAIN_BUILDER_ERROR"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.VifInUse(p1, p2);
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.DomainBuilderError(p1, p2, p3);
}
- if (ErrorDescription[0].equals("ONLY_ALLOWED_ON_OEM_EDITION"))
+ if (ErrorDescription[0].equals("HA_CONSTRAINT_VIOLATION_NETWORK_NOT_SHARED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.OnlyAllowedOnOemEdition(p1);
+ throw new Types.HaConstraintViolationNetworkNotShared(p1);
}
- if (ErrorDescription[0].equals("VDI_IS_A_PHYSICAL_DEVICE"))
+ if (ErrorDescription[0].equals("HOST_CANNOT_DESTROY_SELF"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VdiIsAPhysicalDevice(p1);
- }
- if (ErrorDescription[0].equals("LICENSE_PROCESSING_ERROR"))
- {
- throw new Types.LicenseProcessingError();
+ throw new Types.HostCannotDestroySelf(p1);
}
- if (ErrorDescription[0].equals("ILLEGAL_VBD_DEVICE"))
+ if (ErrorDescription[0].equals("WLB_INTERNAL_ERROR"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.IllegalVbdDevice(p1, p2);
+ throw new Types.WlbInternalError();
}
- if (ErrorDescription[0].equals("CRL_DOES_NOT_EXIST"))
+ if (ErrorDescription[0].equals("FIELD_TYPE_ERROR"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.CrlDoesNotExist(p1);
+ throw new Types.FieldTypeError(p1);
}
- if (ErrorDescription[0].equals("TASK_CANCELLED"))
+ if (ErrorDescription[0].equals("DEVICE_ALREADY_DETACHED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.TaskCancelled(p1);
+ throw new Types.DeviceAlreadyDetached(p1);
}
- if (ErrorDescription[0].equals("VM_CRASHED"))
+ if (ErrorDescription[0].equals("GPU_GROUP_CONTAINS_VGPU"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmCrashed(p1);
+ throw new Types.GpuGroupContainsVgpu(p1);
}
- if (ErrorDescription[0].equals("POOL_AUTH_ENABLE_FAILED_DOMAIN_LOOKUP_FAILED"))
+ if (ErrorDescription[0].equals("DEVICE_DETACH_REJECTED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.PoolAuthEnableFailedDomainLookupFailed(p1, p2);
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.DeviceDetachRejected(p1, p2, p3);
}
- if (ErrorDescription[0].equals("HA_SHOULD_BE_FENCED"))
+ if (ErrorDescription[0].equals("SR_UNKNOWN_DRIVER"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HaShouldBeFenced(p1);
+ throw new Types.SrUnknownDriver(p1);
}
- if (ErrorDescription[0].equals("VM_UNSAFE_BOOT"))
+ if (ErrorDescription[0].equals("HOSTS_NOT_HOMOGENEOUS"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmUnsafeBoot(p1);
+ throw new Types.HostsNotHomogeneous(p1);
}
- if (ErrorDescription[0].equals("PIF_HAS_NO_NETWORK_CONFIGURATION"))
+ if (ErrorDescription[0].equals("VDI_CONTAINS_METADATA_OF_THIS_POOL"))
{
- throw new Types.PifHasNoNetworkConfiguration();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.VdiContainsMetadataOfThisPool(p1, p2);
}
- if (ErrorDescription[0].equals("TOO_BUSY"))
+ if (ErrorDescription[0].equals("SR_NOT_SHARABLE"))
{
- throw new Types.TooBusy();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.SrNotSharable(p1, p2);
}
- if (ErrorDescription[0].equals("VALUE_NOT_SUPPORTED"))
+ if (ErrorDescription[0].equals("POOL_AUTH_ENABLE_FAILED_DUPLICATE_HOSTNAME"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- throw new Types.ValueNotSupported(p1, p2, p3);
+ throw new Types.PoolAuthEnableFailedDuplicateHostname(p1, p2);
}
- if (ErrorDescription[0].equals("SESSION_INVALID"))
+ if (ErrorDescription[0].equals("HA_NOT_ENABLED"))
+ {
+ throw new Types.HaNotEnabled();
+ }
+ if (ErrorDescription[0].equals("SR_ATTACH_FAILED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SessionInvalid(p1);
+ throw new Types.SrAttachFailed(p1);
}
- if (ErrorDescription[0].equals("HA_CONSTRAINT_VIOLATION_NETWORK_NOT_SHARED"))
+ if (ErrorDescription[0].equals("MESSAGE_PARAMETER_COUNT_MISMATCH"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HaConstraintViolationNetworkNotShared(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.MessageParameterCountMismatch(p1, p2, p3);
}
- if (ErrorDescription[0].equals("HA_FAILED_TO_FORM_LIVESET"))
+ if (ErrorDescription[0].equals("VM_MEMORY_SIZE_TOO_LOW"))
{
- throw new Types.HaFailedToFormLiveset();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.VmMemorySizeTooLow(p1);
}
- if (ErrorDescription[0].equals("PIF_CANNOT_BOND_CROSS_HOST"))
+ if (ErrorDescription[0].equals("POOL_JOINING_HOST_MUST_HAVE_SAME_PRODUCT_VERSION"))
{
- throw new Types.PifCannotBondCrossHost();
+ throw new Types.PoolJoiningHostMustHaveSameProductVersion();
}
- if (ErrorDescription[0].equals("EVENT_FROM_TOKEN_PARSE_FAILURE"))
+ if (ErrorDescription[0].equals("VM_REQUIRES_IOMMU"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.EventFromTokenParseFailure(p1);
+ throw new Types.VmRequiresIommu(p1);
}
- if (ErrorDescription[0].equals("SR_REQUIRES_UPGRADE"))
+ if (ErrorDescription[0].equals("POOL_AUTH_ENABLE_FAILED_PERMISSION_DENIED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SrRequiresUpgrade(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.PoolAuthEnableFailedPermissionDenied(p1, p2);
}
- if (ErrorDescription[0].equals("CERTIFICATE_DOES_NOT_EXIST"))
+ if (ErrorDescription[0].equals("VM_REQUIRES_VDI"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.CertificateDoesNotExist(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.VmRequiresVdi(p1, p2);
}
- if (ErrorDescription[0].equals("HA_OPERATION_WOULD_BREAK_FAILOVER_PLAN"))
+ if (ErrorDescription[0].equals("JOINING_HOST_CONNECTION_FAILED"))
{
- throw new Types.HaOperationWouldBreakFailoverPlan();
+ throw new Types.JoiningHostConnectionFailed();
}
- if (ErrorDescription[0].equals("CANNOT_FETCH_PATCH"))
+ if (ErrorDescription[0].equals("NETWORK_ALREADY_CONNECTED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.CannotFetchPatch(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.NetworkAlreadyConnected(p1, p2);
}
- if (ErrorDescription[0].equals("CANNOT_FIND_PATCH"))
+ if (ErrorDescription[0].equals("HOST_HAS_RESIDENT_VMS"))
{
- throw new Types.CannotFindPatch();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.HostHasResidentVms(p1);
+ }
+ if (ErrorDescription[0].equals("SESSION_NOT_REGISTERED"))
+ {
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.SessionNotRegistered(p1);
}
if (ErrorDescription[0].equals("DB_UNIQUENESS_CONSTRAINT_VIOLATION"))
{
@@ -1056,477 +1097,470 @@ public class Types
String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
throw new Types.DbUniquenessConstraintViolation(p1, p2, p3);
}
- if (ErrorDescription[0].equals("VM_REQUIRES_NETWORK"))
+ if (ErrorDescription[0].equals("SR_INDESTRUCTIBLE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.VmRequiresNetwork(p1, p2);
+ throw new Types.SrIndestructible(p1);
}
- if (ErrorDescription[0].equals("VBD_NOT_EMPTY"))
+ if (ErrorDescription[0].equals("WLB_XENSERVER_MALFORMED_RESPONSE"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VbdNotEmpty(p1);
+ throw new Types.WlbXenserverMalformedResponse();
}
- if (ErrorDescription[0].equals("HOST_NOT_ENOUGH_FREE_MEMORY"))
+ if (ErrorDescription[0].equals("VDI_NOT_AVAILABLE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.HostNotEnoughFreeMemory(p1, p2);
+ throw new Types.VdiNotAvailable(p1);
}
- if (ErrorDescription[0].equals("VM_MIGRATE_FAILED"))
+ if (ErrorDescription[0].equals("SR_FULL"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- String p4 = ErrorDescription.length > 4 ? ErrorDescription[4] : "";
- throw new Types.VmMigrateFailed(p1, p2, p3, p4);
+ throw new Types.SrFull(p1, p2);
}
- if (ErrorDescription[0].equals("SR_OPERATION_NOT_SUPPORTED"))
+ if (ErrorDescription[0].equals("CANNOT_FETCH_PATCH"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.SrOperationNotSupported(p1);
+ throw new Types.CannotFetchPatch(p1);
}
- if (ErrorDescription[0].equals("DEVICE_NOT_ATTACHED"))
+ if (ErrorDescription[0].equals("HOST_IN_EMERGENCY_MODE"))
{
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.DeviceNotAttached(p1);
+ throw new Types.HostInEmergencyMode();
}
- if (ErrorDescription[0].equals("HOST_DISABLED"))
+ if (ErrorDescription[0].equals("IMPORT_ERROR_SOME_CHECKSUMS_FAILED"))
+ {
+ throw new Types.ImportErrorSomeChecksumsFailed();
+ }
+ if (ErrorDescription[0].equals("XENAPI_MISSING_PLUGIN"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HostDisabled(p1);
+ throw new Types.XenapiMissingPlugin(p1);
}
- if (ErrorDescription[0].equals("SYSTEM_STATUS_MUST_USE_TAR_ON_OEM"))
+ if (ErrorDescription[0].equals("AUTH_ALREADY_ENABLED"))
{
- throw new Types.SystemStatusMustUseTarOnOem();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.AuthAlreadyEnabled(p1, p2);
}
- if (ErrorDescription[0].equals("XEN_VSS_REQ_ERROR_PREPARING_WRITERS"))
+ if (ErrorDescription[0].equals("VALUE_NOT_SUPPORTED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.XenVssReqErrorPreparingWriters(p1, p2);
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.ValueNotSupported(p1, p2, p3);
}
- if (ErrorDescription[0].equals("AUTH_ENABLE_FAILED"))
+ if (ErrorDescription[0].equals("TRANSPORT_PIF_NOT_CONFIGURED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.AuthEnableFailed(p1);
+ throw new Types.TransportPifNotConfigured(p1);
}
- if (ErrorDescription[0].equals("JOINING_HOST_CANNOT_CONTAIN_SHARED_SRS"))
+ if (ErrorDescription[0].equals("PATCH_PRECHECK_FAILED_VM_RUNNING"))
{
- throw new Types.JoiningHostCannotContainSharedSrs();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.PatchPrecheckFailedVmRunning(p1);
}
- if (ErrorDescription[0].equals("VM_NO_VCPUS"))
+ if (ErrorDescription[0].equals("SR_HAS_PBD"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmNoVcpus(p1);
+ throw new Types.SrHasPbd(p1);
}
- if (ErrorDescription[0].equals("INVALID_PATCH_WITH_LOG"))
+ if (ErrorDescription[0].equals("INVALID_DEVICE"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.InvalidPatchWithLog(p1);
+ throw new Types.InvalidDevice(p1);
}
- if (ErrorDescription[0].equals("SR_DEVICE_IN_USE"))
+ if (ErrorDescription[0].equals("VGPU_TYPE_NOT_COMPATIBLE_WITH_RUNNING_TYPE"))
{
- throw new Types.SrDeviceInUse();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
+ throw new Types.VgpuTypeNotCompatibleWithRunningType(p1, p2, p3);
}
- if (ErrorDescription[0].equals("HOST_CD_DRIVE_EMPTY"))
+ if (ErrorDescription[0].equals("ACTIVATION_WHILE_NOT_FREE"))
{
- throw new Types.HostCdDriveEmpty();
+ throw new Types.ActivationWhileNotFree();
}
- if (ErrorDescription[0].equals("HA_HOST_IS_ARMED"))
+ if (ErrorDescription[0].equals("VDI_READONLY"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HaHostIsArmed(p1);
+ throw new Types.VdiReadonly(p1);
}
- if (ErrorDescription[0].equals("EVENT_SUBSCRIPTION_PARSE_FAILURE"))
+ if (ErrorDescription[0].equals("VDI_IS_NOT_ISO"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.EventSubscriptionParseFailure(p1);
+ String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
+ throw new Types.VdiIsNotIso(p1, p2);
}
- if (ErrorDescription[0].equals("LICENSE_EXPIRED"))
+ if (ErrorDescription[0].equals("HOST_DISABLED"))
{
- throw new Types.LicenseExpired();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.HostDisabled(p1);
}
- if (ErrorDescription[0].equals("SESSION_AUTHENTICATION_FAILED"))
+ if (ErrorDescription[0].equals("WLB_CONNECTION_REFUSED"))
{
- throw new Types.SessionAuthenticationFailed();
+ throw new Types.WlbConnectionRefused();
}
- if (ErrorDescription[0].equals("PIF_IS_VLAN"))
+ if (ErrorDescription[0].equals("VBD_NOT_EMPTY"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.PifIsVlan(p1);
+ throw new Types.VbdNotEmpty(p1);
}
- if (ErrorDescription[0].equals("VMPP_ARCHIVE_MORE_FREQUENT_THAN_BACKUP"))
+ if (ErrorDescription[0].equals("CANNOT_FIND_STATE_PARTITION"))
{
- throw new Types.VmppArchiveMoreFrequentThanBackup();
+ throw new Types.CannotFindStatePartition();
}
- if (ErrorDescription[0].equals("V6D_FAILURE"))
+ if (ErrorDescription[0].equals("INTERFACE_HAS_NO_IP"))
{
- throw new Types.V6dFailure();
+ String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
+ throw new Types.InterfaceHasNoIp(p1);
}
- if (ErrorDescription[0].equals("JOINING_HOST_CANNOT_BE_MASTER_OF_OTHER_HOSTS"))
+ if (ErrorDescription[0].equals("JOINING_HOST_CANNOT_HAVE_RUNNING_OR_SUSPENDED_VMS"))
{
- throw new Types.JoiningHostCannotBeMasterOfOtherHosts();
+ throw new Types.JoiningHostCannotHaveRunningOrSuspendedVms();
}
- if (ErrorDescription[0].equals("HOST_HAS_RESIDENT_VMS"))
+ if (ErrorDescription[0].equals("AUTH_ENABLE_FAILED_DOMAIN_LOOKUP_FAILED"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.HostHasResidentVms(p1);
+ throw new Types.AuthEnableFailedDomainLookupFailed(p1);
}
- if (ErrorDescription[0].equals("VM_CHECKPOINT_SUSPEND_FAILED"))
+ if (ErrorDescription[0].equals("INVALID_FEATURE_STRING"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.VmCheckpointSuspendFailed(p1);
+ throw new Types.InvalidFeatureString(p1);
}
- if (ErrorDescription[0].equals("PIF_IS_MANAGEMENT_INTERFACE"))
+ if (ErrorDescription[0].equals("CANNOT_CONTACT_HOST"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.PifIsManagementInterface(p1);
+ throw new Types.CannotContactHost(p1);
}
if (ErrorDescription[0].equals("MAC_INVALID"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
throw new Types.MacInvalid(p1);
}
- if (ErrorDescription[0].equals("XEN_VSS_REQ_ERROR_START_SNAPSHOT_SET_FAILED"))
- {
- String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- throw new Types.XenVssReqErrorStartSnapshotSetFailed(p1, p2);
- }
if (ErrorDescription[0].equals("VBD_IS_EMPTY"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
throw new Types.VbdIsEmpty(p1);
}
- if (ErrorDescription[0].equals("PATCH_PRECHECK_FAILED_WRONG_SERVER_VERSION"))
+ if (ErrorDescription[0].equals("POOL_AUTH_ENABLE_FAILED_INVALID_OU"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
String p2 = ErrorDescription.length > 2 ? ErrorDescription[2] : "";
- String p3 = ErrorDescription.length > 3 ? ErrorDescription[3] : "";
- throw new Types.PatchPrecheckFailedWrongServerVersion(p1, p2, p3);
- }
- if (ErrorDescription[0].equals("CANNOT_FIND_STATE_PARTITION"))
- {
- throw new Types.CannotFindStatePartition();
- }
- if (ErrorDescription[0].equals("WLB_AUTHENTICATION_FAILED"))
- {
- throw new Types.WlbAuthenticationFailed();
+ throw new Types.PoolAuthEnableFailedInvalidOu(p1, p2);
}
- if (ErrorDescription[0].equals("AUTH_UNKNOWN_TYPE"))
+ if (ErrorDescription[0].equals("MESSAGE_METHOD_UNKNOWN"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.AuthUnknownType(p1);
- }
- if (ErrorDescription[0].equals("NOT_IN_EMERGENCY_MODE"))
- {
- throw new Types.NotInEmergencyMode();
+ throw new Types.MessageMethodUnknown(p1);
}
- if (ErrorDescription[0].equals("AUTH_DISABLE_FAILED"))
+ if (ErrorDescription[0].equals("PIF_DOES_NOT_ALLOW_UNPLUG"))
{
String p1 = ErrorDescription.length > 1 ? ErrorDescription[1] : "";
- throw new Types.AuthDisableFailed(p1);
+
<TRUNCATED>
[24/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Fix jetty:run startup to include the mysql driver as a dependency for developers
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7aa70fe8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7aa70fe8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7aa70fe8
Branch: refs/heads/acl-item-cidrs
Commit: 7aa70fe82a55f0c5b52c5b905af2f123315570b0
Parents: 14689d7
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Feb 25 12:13:29 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 25 12:30:46 2014 +0100
----------------------------------------------------------------------
client/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7aa70fe8/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 4eb421d..0980b64 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -365,6 +365,14 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.26</version>
+ <dependencies>
+ <!-- specify the dependent jdbc driver here -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${cs.mysql.version}</version>
+ </dependency>
+ </dependencies>
<configuration>
<scanIntervalSeconds>0</scanIntervalSeconds>
<stopPort>9966</stopPort>
[15/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Network.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Network.java b/deps/XenServerJava/src/com/xensource/xenapi/Network.java
index e9194ef..9f8c929 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Network.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Network.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Network extends XenAPIObject {
* For internal use only.
*/
Network(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Network extends XenAPIObject {
{
if (obj != null && obj instanceof Network)
{
- Network other = (Network)obj;
+ Network other = (Network) obj;
return other.ref.equals(this.ref);
} else
{
@@ -118,8 +119,8 @@ public class Network extends XenAPIObject {
/**
* Convert a network.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -196,15 +197,15 @@ public class Network extends XenAPIObject {
* @return all fields from the object
*/
public Network.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toNetworkRecord(result);
+ return Types.toNetworkRecord(result);
}
/**
@@ -214,15 +215,15 @@ public class Network extends XenAPIObject {
* @return reference to the object
*/
public static Network getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toNetwork(result);
+ return Types.toNetwork(result);
}
/**
@@ -232,9 +233,9 @@ public class Network extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, Network.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.network.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -251,16 +252,16 @@ public class Network extends XenAPIObject {
* @return reference to the newly created object
*/
public static Network create(Connection c, Network.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toNetwork(result);
+ return Types.toNetwork(result);
}
/**
@@ -269,9 +270,9 @@ public class Network extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.network.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -285,9 +286,9 @@ public class Network extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -302,15 +303,15 @@ public class Network extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<Network> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfNetwork(result);
+ return Types.toSetOfNetwork(result);
}
/**
@@ -319,15 +320,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -336,15 +337,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -353,15 +354,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -370,15 +371,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public Set<Types.NetworkOperations> getAllowedOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_allowed_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfNetworkOperations(result);
+ return Types.toSetOfNetworkOperations(result);
}
/**
@@ -387,15 +388,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public Map<String, Types.NetworkOperations> getCurrentOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_current_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringNetworkOperations(result);
+ return Types.toMapOfStringNetworkOperations(result);
}
/**
@@ -404,15 +405,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public Set<VIF> getVIFs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_VIFs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVIF(result);
+ return Types.toSetOfVIF(result);
}
/**
@@ -421,15 +422,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public Set<PIF> getPIFs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_PIFs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPIF(result);
+ return Types.toSetOfPIF(result);
}
/**
@@ -438,15 +439,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public Long getMTU(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_MTU";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -455,15 +456,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -472,15 +473,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public String getBridge(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_bridge";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -489,15 +490,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public Map<String, Blob> getBlobs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_blobs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringBlob(result);
+ return Types.toMapOfStringBlob(result);
}
/**
@@ -506,15 +507,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public Set<String> getTags(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -523,15 +524,15 @@ public class Network extends XenAPIObject {
* @return value of the field
*/
public Types.NetworkDefaultLockingMode getDefaultLockingMode(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_default_locking_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toNetworkDefaultLockingMode(result);
+ return Types.toNetworkDefaultLockingMode(result);
}
/**
@@ -540,9 +541,9 @@ public class Network extends XenAPIObject {
* @param label New value to set
*/
public void setNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(label)};
@@ -556,9 +557,9 @@ public class Network extends XenAPIObject {
* @param description New value to set
*/
public void setNameDescription(Connection c, String description) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(description)};
@@ -572,9 +573,9 @@ public class Network extends XenAPIObject {
* @param MTU New value to set
*/
public void setMTU(Connection c, Long MTU) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.set_MTU";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(MTU)};
@@ -588,9 +589,9 @@ public class Network extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -605,9 +606,9 @@ public class Network extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -621,9 +622,9 @@ public class Network extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -637,9 +638,9 @@ public class Network extends XenAPIObject {
* @param tags New value to set
*/
public void setTags(Connection c, Set<String> tags) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.set_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(tags)};
@@ -653,9 +654,9 @@ public class Network extends XenAPIObject {
* @param value New value to add
*/
public void addTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.add_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -669,9 +670,9 @@ public class Network extends XenAPIObject {
* @param value Value to remove
*/
public void removeTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.remove_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -688,13 +689,12 @@ public class Network extends XenAPIObject {
* @return Task
*/
public Task createNewBlobAsync(Connection c, String name, String mimeType, Boolean _public) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.network.create_new_blob";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType),
- Marshalling.toXMLRPC(_public)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType), Marshalling.toXMLRPC(_public)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -709,16 +709,15 @@ public class Network extends XenAPIObject {
* @return The reference of the blob, needed for populating its data
*/
public Blob createNewBlob(Connection c, String name, String mimeType, Boolean _public) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.create_new_blob";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType),
- Marshalling.toXMLRPC(_public)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(mimeType), Marshalling.toXMLRPC(_public)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBlob(result);
+ return Types.toBlob(result);
}
/**
@@ -728,9 +727,9 @@ public class Network extends XenAPIObject {
* @return Task
*/
public Task setDefaultLockingModeAsync(Connection c, Types.NetworkDefaultLockingMode value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.network.set_default_locking_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -745,9 +744,9 @@ public class Network extends XenAPIObject {
* @param value The default locking mode for VIFs attached to this network.
*/
public void setDefaultLockingMode(Connection c, Types.NetworkDefaultLockingMode value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.set_default_locking_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -761,15 +760,15 @@ public class Network extends XenAPIObject {
* @return references to all objects
*/
public static Set<Network> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfNetwork(result);
+ return Types.toSetOfNetwork(result);
}
/**
@@ -778,15 +777,15 @@ public class Network extends XenAPIObject {
* @return records of all objects
*/
public static Map<Network, Network.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "network.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfNetworkNetworkRecord(result);
+ return Types.toMapOfNetworkNetworkRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/PBD.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/PBD.java b/deps/XenServerJava/src/com/xensource/xenapi/PBD.java
index d289824..bae095f 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/PBD.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/PBD.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class PBD extends XenAPIObject {
* For internal use only.
*/
PBD(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class PBD extends XenAPIObject {
{
if (obj != null && obj instanceof PBD)
{
- PBD other = (PBD)obj;
+ PBD other = (PBD) obj;
return other.ref.equals(this.ref);
} else
{
@@ -111,8 +112,8 @@ public class PBD extends XenAPIObject {
/**
* Convert a PBD.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("host", this.host == null ? new Host("OpaqueRef:NULL") : this.host);
map.put("SR", this.SR == null ? new SR("OpaqueRef:NULL") : this.SR);
@@ -154,15 +155,15 @@ public class PBD extends XenAPIObject {
* @return all fields from the object
*/
public PBD.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPBDRecord(result);
+ return Types.toPBDRecord(result);
}
/**
@@ -172,15 +173,15 @@ public class PBD extends XenAPIObject {
* @return reference to the object
*/
public static PBD getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPBD(result);
+ return Types.toPBD(result);
}
/**
@@ -190,9 +191,9 @@ public class PBD extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, PBD.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PBD.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -209,16 +210,16 @@ public class PBD extends XenAPIObject {
* @return reference to the newly created object
*/
public static PBD create(Connection c, PBD.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPBD(result);
+ return Types.toPBD(result);
}
/**
@@ -227,9 +228,9 @@ public class PBD extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PBD.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -243,9 +244,9 @@ public class PBD extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -259,15 +260,15 @@ public class PBD extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -276,15 +277,15 @@ public class PBD extends XenAPIObject {
* @return value of the field
*/
public Host getHost(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.get_host";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -293,15 +294,15 @@ public class PBD extends XenAPIObject {
* @return value of the field
*/
public SR getSR(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.get_SR";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -310,15 +311,15 @@ public class PBD extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getDeviceConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.get_device_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -327,15 +328,15 @@ public class PBD extends XenAPIObject {
* @return value of the field
*/
public Boolean getCurrentlyAttached(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.get_currently_attached";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -344,15 +345,15 @@ public class PBD extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -361,9 +362,9 @@ public class PBD extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -378,9 +379,9 @@ public class PBD extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -394,9 +395,9 @@ public class PBD extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -410,10 +411,10 @@ public class PBD extends XenAPIObject {
* @return Task
*/
public Task plugAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SrUnknownDriver {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrUnknownDriver {
String method_call = "Async.PBD.plug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -427,10 +428,10 @@ public class PBD extends XenAPIObject {
*
*/
public void plug(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SrUnknownDriver {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrUnknownDriver {
String method_call = "PBD.plug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -444,9 +445,9 @@ public class PBD extends XenAPIObject {
* @return Task
*/
public Task unplugAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PBD.unplug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -460,9 +461,9 @@ public class PBD extends XenAPIObject {
*
*/
public void unplug(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.unplug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -477,9 +478,9 @@ public class PBD extends XenAPIObject {
* @return Task
*/
public Task setDeviceConfigAsync(Connection c, Map<String, String> value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PBD.set_device_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -494,9 +495,9 @@ public class PBD extends XenAPIObject {
* @param value The new value of the PBD's device_config
*/
public void setDeviceConfig(Connection c, Map<String, String> value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.set_device_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -510,15 +511,15 @@ public class PBD extends XenAPIObject {
* @return references to all objects
*/
public static Set<PBD> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPBD(result);
+ return Types.toSetOfPBD(result);
}
/**
@@ -527,15 +528,15 @@ public class PBD extends XenAPIObject {
* @return records of all objects
*/
public static Map<PBD, PBD.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PBD.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfPBDPBDRecord(result);
+ return Types.toMapOfPBDPBDRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/PCI.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/PCI.java b/deps/XenServerJava/src/com/xensource/xenapi/PCI.java
index e11230a..fbee50a 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/PCI.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/PCI.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class PCI extends XenAPIObject {
* For internal use only.
*/
PCI(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class PCI extends XenAPIObject {
{
if (obj != null && obj instanceof PCI)
{
- PCI other = (PCI)obj;
+ PCI other = (PCI) obj;
return other.ref.equals(this.ref);
} else
{
@@ -113,8 +114,8 @@ public class PCI extends XenAPIObject {
/**
* Convert a PCI.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("class_name", this.clazzName == null ? "" : this.clazzName);
map.put("vendor_name", this.vendorName == null ? "" : this.vendorName);
@@ -166,15 +167,15 @@ public class PCI extends XenAPIObject {
* @return all fields from the object
*/
public PCI.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPCIRecord(result);
+ return Types.toPCIRecord(result);
}
/**
@@ -184,15 +185,15 @@ public class PCI extends XenAPIObject {
* @return reference to the object
*/
public static PCI getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPCI(result);
+ return Types.toPCI(result);
}
/**
@@ -201,15 +202,15 @@ public class PCI extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -218,15 +219,15 @@ public class PCI extends XenAPIObject {
* @return value of the field
*/
public String getClazzName(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_class_name";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -235,15 +236,15 @@ public class PCI extends XenAPIObject {
* @return value of the field
*/
public String getVendorName(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_vendor_name";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -252,15 +253,15 @@ public class PCI extends XenAPIObject {
* @return value of the field
*/
public String getDeviceName(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_device_name";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -269,15 +270,15 @@ public class PCI extends XenAPIObject {
* @return value of the field
*/
public Host getHost(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_host";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -286,15 +287,15 @@ public class PCI extends XenAPIObject {
* @return value of the field
*/
public String getPciId(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_pci_id";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -303,15 +304,15 @@ public class PCI extends XenAPIObject {
* @return value of the field
*/
public Set<PCI> getDependencies(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_dependencies";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPCI(result);
+ return Types.toSetOfPCI(result);
}
/**
@@ -320,15 +321,15 @@ public class PCI extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -337,9 +338,9 @@ public class PCI extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -354,9 +355,9 @@ public class PCI extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -370,9 +371,9 @@ public class PCI extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -386,15 +387,15 @@ public class PCI extends XenAPIObject {
* @return references to all objects
*/
public static Set<PCI> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPCI(result);
+ return Types.toSetOfPCI(result);
}
/**
@@ -403,15 +404,15 @@ public class PCI extends XenAPIObject {
* @return records of all objects
*/
public static Map<PCI, PCI.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PCI.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfPCIPCIRecord(result);
+ return Types.toMapOfPCIPCIRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/PGPU.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/PGPU.java b/deps/XenServerJava/src/com/xensource/xenapi/PGPU.java
index 0f5ddb4..43eadf5 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/PGPU.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/PGPU.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class PGPU extends XenAPIObject {
* For internal use only.
*/
PGPU(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class PGPU extends XenAPIObject {
{
if (obj != null && obj instanceof PGPU)
{
- PGPU other = (PGPU)obj;
+ PGPU other = (PGPU) obj;
return other.ref.equals(this.ref);
} else
{
@@ -104,19 +105,27 @@ public class PGPU extends XenAPIObject {
print.printf("%1$20s: %2$s\n", "GPUGroup", this.GPUGroup);
print.printf("%1$20s: %2$s\n", "host", this.host);
print.printf("%1$20s: %2$s\n", "otherConfig", this.otherConfig);
+ print.printf("%1$20s: %2$s\n", "supportedVGPUTypes", this.supportedVGPUTypes);
+ print.printf("%1$20s: %2$s\n", "enabledVGPUTypes", this.enabledVGPUTypes);
+ print.printf("%1$20s: %2$s\n", "residentVGPUs", this.residentVGPUs);
+ print.printf("%1$20s: %2$s\n", "supportedVGPUMaxCapacities", this.supportedVGPUMaxCapacities);
return writer.toString();
}
/**
* Convert a PGPU.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("PCI", this.PCI == null ? new PCI("OpaqueRef:NULL") : this.PCI);
map.put("GPU_group", this.GPUGroup == null ? new GPUGroup("OpaqueRef:NULL") : this.GPUGroup);
map.put("host", this.host == null ? new Host("OpaqueRef:NULL") : this.host);
map.put("other_config", this.otherConfig == null ? new HashMap<String, String>() : this.otherConfig);
+ map.put("supported_VGPU_types", this.supportedVGPUTypes == null ? new LinkedHashSet<VGPUType>() : this.supportedVGPUTypes);
+ map.put("enabled_VGPU_types", this.enabledVGPUTypes == null ? new LinkedHashSet<VGPUType>() : this.enabledVGPUTypes);
+ map.put("resident_VGPUs", this.residentVGPUs == null ? new LinkedHashSet<VGPU>() : this.residentVGPUs);
+ map.put("supported_VGPU_max_capacities", this.supportedVGPUMaxCapacities == null ? new HashMap<VGPUType, Long>() : this.supportedVGPUMaxCapacities);
return map;
}
@@ -140,6 +149,22 @@ public class PGPU extends XenAPIObject {
* Additional configuration
*/
public Map<String, String> otherConfig;
+ /**
+ * List of VGPU types supported by the underlying hardware
+ */
+ public Set<VGPUType> supportedVGPUTypes;
+ /**
+ * List of VGPU types which have been enabled for this PGPU
+ */
+ public Set<VGPUType> enabledVGPUTypes;
+ /**
+ * List of VGPUs running on this PGPU
+ */
+ public Set<VGPU> residentVGPUs;
+ /**
+ * A map relating each VGPU type supported on this GPU to the maximum number of VGPUs of that type which can run simultaneously on this GPU
+ */
+ public Map<VGPUType, Long> supportedVGPUMaxCapacities;
}
/**
@@ -148,15 +173,15 @@ public class PGPU extends XenAPIObject {
* @return all fields from the object
*/
public PGPU.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPGPURecord(result);
+ return Types.toPGPURecord(result);
}
/**
@@ -166,15 +191,15 @@ public class PGPU extends XenAPIObject {
* @return reference to the object
*/
public static PGPU getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPGPU(result);
+ return Types.toPGPU(result);
}
/**
@@ -183,15 +208,15 @@ public class PGPU extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -200,15 +225,15 @@ public class PGPU extends XenAPIObject {
* @return value of the field
*/
public PCI getPCI(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.get_PCI";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPCI(result);
+ return Types.toPCI(result);
}
/**
@@ -217,15 +242,15 @@ public class PGPU extends XenAPIObject {
* @return value of the field
*/
public GPUGroup getGPUGroup(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.get_GPU_group";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toGPUGroup(result);
+ return Types.toGPUGroup(result);
}
/**
@@ -234,15 +259,15 @@ public class PGPU extends XenAPIObject {
* @return value of the field
*/
public Host getHost(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.get_host";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -251,15 +276,83 @@ public class PGPU extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
+ }
+
+ /**
+ * Get the supported_VGPU_types field of the given PGPU.
+ *
+ * @return value of the field
+ */
+ public Set<VGPUType> getSupportedVGPUTypes(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "PGPU.get_supported_VGPU_types";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfVGPUType(result);
+ }
+
+ /**
+ * Get the enabled_VGPU_types field of the given PGPU.
+ *
+ * @return value of the field
+ */
+ public Set<VGPUType> getEnabledVGPUTypes(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "PGPU.get_enabled_VGPU_types";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfVGPUType(result);
+ }
+
+ /**
+ * Get the resident_VGPUs field of the given PGPU.
+ *
+ * @return value of the field
+ */
+ public Set<VGPU> getResidentVGPUs(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "PGPU.get_resident_VGPUs";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfVGPU(result);
+ }
+
+ /**
+ * Get the supported_VGPU_max_capacities field of the given PGPU.
+ *
+ * @return value of the field
+ */
+ public Map<VGPUType, Long> getSupportedVGPUMaxCapacities(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "PGPU.get_supported_VGPU_max_capacities";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toMapOfVGPUTypeLong(result);
}
/**
@@ -268,9 +361,9 @@ public class PGPU extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -285,9 +378,9 @@ public class PGPU extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -301,9 +394,9 @@ public class PGPU extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -312,20 +405,192 @@ public class PGPU extends XenAPIObject {
}
/**
+ *
+ *
+ * @param value The VGPU type to enable
+ * @return Task
+ */
+ public Task addEnabledVGPUTypesAsync(Connection c, VGPUType value) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "Async.PGPU.add_enabled_VGPU_types";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
+ *
+ *
+ * @param value The VGPU type to enable
+ */
+ public void addEnabledVGPUTypes(Connection c, VGPUType value) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "PGPU.add_enabled_VGPU_types";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
+ Map response = c.dispatch(method_call, method_params);
+ return;
+ }
+
+ /**
+ *
+ *
+ * @param value The VGPU type to disable
+ * @return Task
+ */
+ public Task removeEnabledVGPUTypesAsync(Connection c, VGPUType value) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "Async.PGPU.remove_enabled_VGPU_types";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
+ *
+ *
+ * @param value The VGPU type to disable
+ */
+ public void removeEnabledVGPUTypes(Connection c, VGPUType value) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "PGPU.remove_enabled_VGPU_types";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
+ Map response = c.dispatch(method_call, method_params);
+ return;
+ }
+
+ /**
+ *
+ *
+ * @param value The VGPU types to enable
+ * @return Task
+ */
+ public Task setEnabledVGPUTypesAsync(Connection c, Set<VGPUType> value) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "Async.PGPU.set_enabled_VGPU_types";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
+ *
+ *
+ * @param value The VGPU types to enable
+ */
+ public void setEnabledVGPUTypes(Connection c, Set<VGPUType> value) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "PGPU.set_enabled_VGPU_types";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
+ Map response = c.dispatch(method_call, method_params);
+ return;
+ }
+
+ /**
+ *
+ *
+ * @param value The group to which the PGPU will be moved
+ * @return Task
+ */
+ public Task setGPUGroupAsync(Connection c, GPUGroup value) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "Async.PGPU.set_GPU_group";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
+ *
+ *
+ * @param value The group to which the PGPU will be moved
+ */
+ public void setGPUGroup(Connection c, GPUGroup value) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "PGPU.set_GPU_group";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
+ Map response = c.dispatch(method_call, method_params);
+ return;
+ }
+
+ /**
+ *
+ *
+ * @param vgpuType The VGPU type for which we want to find the number of VGPUs which can still be started on this PGPU
+ * @return Task
+ */
+ public Task getRemainingCapacityAsync(Connection c, VGPUType vgpuType) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "Async.PGPU.get_remaining_capacity";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(vgpuType)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
+ *
+ *
+ * @param vgpuType The VGPU type for which we want to find the number of VGPUs which can still be started on this PGPU
+ * @return The number of VGPUs of the specified type which can still be started on this PGPU
+ */
+ public Long getRemainingCapacity(Connection c, VGPUType vgpuType) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "PGPU.get_remaining_capacity";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(vgpuType)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toLong(result);
+ }
+
+ /**
* Return a list of all the PGPUs known to the system.
*
* @return references to all objects
*/
public static Set<PGPU> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPGPU(result);
+ return Types.toSetOfPGPU(result);
}
/**
@@ -334,15 +599,15 @@ public class PGPU extends XenAPIObject {
* @return records of all objects
*/
public static Map<PGPU, PGPU.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PGPU.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfPGPUPGPURecord(result);
+ return Types.toMapOfPGPUPGPURecord(result);
}
}
\ No newline at end of file
[23/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Gluster should store volumes in qcow2 format
By default all network disks are in RAW format. Gluster works fine with
QCOW2 which has some advantages.
Disks are by default in QCOW2 format. It is possible to run into
a mismatch, where the disk is in QCOW2 format, but QEMU gets started
with format=raw. This causes the virtual machines to lockup on boot.
Failures to start a virtual machine can be verified by checking the log
of the virtual machine, and compare the output of 'qemu-img info'.
In /var/log/libvirt/qemu/<VM>.log find the URL for the drive:
-drive file=gluster+tcp://...,format=raw,..
Compare this with the 'qemu-img info' output of the same file, mounted
under /mnt/<pool-uuid>/<img-uuid>:
# qemu-img info /mnt/<pool-uuid>/<img-uuid>
...
file format: qcow2
...
This change makes passes the format when creating a disk located on RBD
(RAW only) and Gluster (QCOW2).
Signed-off-by: Niels de Vos <nd...@redhat.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14689d78
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14689d78
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14689d78
Branch: refs/heads/acl-item-cidrs
Commit: 14689d781005006d95d5f67573331fd64e4c57a6
Parents: c02197a
Author: Niels de Vos <nd...@redhat.com>
Authored: Sun Feb 23 14:32:24 2014 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Feb 25 12:08:46 2014 +0100
----------------------------------------------------------------------
.../hypervisor/kvm/resource/LibvirtComputingResource.java | 8 ++++----
.../hypervisor/kvm/resource/LibvirtDomainXMLParser.java | 9 ++++++++-
.../src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 8 ++++----
.../cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 4 ++--
4 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14689d78/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index e6c750b..26407a1 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3704,13 +3704,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
we pass the pool's UUID as the authSecret
*/
disk.defNetworkBasedDisk(physicalDisk.getPath().replace("rbd:", ""), pool.getSourceHost(), pool.getSourcePort(), pool.getAuthUserName(),
- pool.getUuid(), devId, diskBusType, diskProtocol.RBD);
+ pool.getUuid(), devId, diskBusType, diskProtocol.RBD, DiskDef.diskFmtType.RAW);
} else if (pool.getType() == StoragePoolType.Gluster) {
String mountpoint = pool.getLocalPath();
String path = physicalDisk.getPath();
String glusterVolume = pool.getSourceDir().replace("/", "");
disk.defNetworkBasedDisk(glusterVolume + path.replace(mountpoint, ""), pool.getSourceHost(), pool.getSourcePort(), null,
- null, devId, diskBusType, diskProtocol.GLUSTER);
+ null, devId, diskBusType, diskProtocol.GLUSTER, DiskDef.diskFmtType.QCOW2);
} else if (pool.getType() == StoragePoolType.CLVM || physicalDisk.getFormat() == PhysicalDiskFormat.RAW) {
disk.defBlockBasedDisk(physicalDisk.getPath(), devId, diskBusType);
} else {
@@ -3867,10 +3867,10 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
diskdef = new DiskDef();
if (attachingPool.getType() == StoragePoolType.RBD) {
diskdef.defNetworkBasedDisk(attachingDisk.getPath(), attachingPool.getSourceHost(), attachingPool.getSourcePort(), attachingPool.getAuthUserName(),
- attachingPool.getUuid(), devId, DiskDef.diskBus.VIRTIO, diskProtocol.RBD);
+ attachingPool.getUuid(), devId, DiskDef.diskBus.VIRTIO, diskProtocol.RBD, DiskDef.diskFmtType.RAW);
} else if (attachingPool.getType() == StoragePoolType.Gluster) {
diskdef.defNetworkBasedDisk(attachingDisk.getPath(), attachingPool.getSourceHost(), attachingPool.getSourcePort(), null,
- null, devId, DiskDef.diskBus.VIRTIO, diskProtocol.GLUSTER);
+ null, devId, DiskDef.diskBus.VIRTIO, diskProtocol.GLUSTER, DiskDef.diskFmtType.QCOW2);
} else if (attachingDisk.getFormat() == PhysicalDiskFormat.QCOW2) {
diskdef.defFileBasedDisk(attachingDisk.getPath(), devId, DiskDef.diskBus.VIRTIO, DiskDef.diskFmtType.QCOW2);
} else if (attachingDisk.getFormat() == PhysicalDiskFormat.RAW) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14689d78/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
index 9cf6a90..fabe9a8 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java
@@ -64,6 +64,7 @@ public class LibvirtDomainXMLParser {
String type = disk.getAttribute("type");
DiskDef def = new DiskDef();
if (type.equalsIgnoreCase("network")) {
+ String diskFmtType = getAttrValue("driver", "type", disk);
String diskCacheMode = getAttrValue("driver", "cache", disk);
String diskPath = getAttrValue("source", "name", disk);
String protocol = getAttrValue("source", "protocol", disk);
@@ -73,9 +74,15 @@ public class LibvirtDomainXMLParser {
int port = Integer.parseInt(getAttrValue("host", "port", disk));
String diskLabel = getAttrValue("target", "dev", disk);
String bus = getAttrValue("target", "bus", disk);
+
+ DiskDef.diskFmtType fmt = null;
+ if (diskFmtType != null) {
+ fmt = DiskDef.diskFmtType.valueOf(diskFmtType.toUpperCase());
+ }
+
def.defNetworkBasedDisk(diskPath, host, port, authUserName, poolUuid, diskLabel,
DiskDef.diskBus.valueOf(bus.toUpperCase()),
- DiskDef.diskProtocol.valueOf(protocol.toUpperCase()));
+ DiskDef.diskProtocol.valueOf(protocol.toUpperCase()), fmt);
def.setCacheMode(DiskDef.diskCacheMode.valueOf(diskCacheMode.toUpperCase()));
} else {
String diskFmtType = getAttrValue("driver", "type", disk);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14689d78/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 290c5a9..4032305 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -530,10 +530,10 @@ public class LibvirtVMDef {
}
public void defNetworkBasedDisk(String diskName, String sourceHost, int sourcePort, String authUserName, String authSecretUUID, int devId, diskBus bus,
- diskProtocol protocol) {
+ diskProtocol protocol, diskFmtType diskFmtType) {
_diskType = diskType.NETWORK;
_deviceType = deviceType.DISK;
- _diskFmtType = diskFmtType.RAW;
+ _diskFmtType = diskFmtType;
_diskCacheMode = diskCacheMode.NONE;
_sourcePath = diskName;
_sourceHost = sourceHost;
@@ -546,10 +546,10 @@ public class LibvirtVMDef {
}
public void defNetworkBasedDisk(String diskName, String sourceHost, int sourcePort, String authUserName, String authSecretUUID, String diskLabel, diskBus bus,
- diskProtocol protocol) {
+ diskProtocol protocol, diskFmtType diskFmtType) {
_diskType = diskType.NETWORK;
_deviceType = deviceType.DISK;
- _diskFmtType = diskFmtType.RAW;
+ _diskFmtType = diskFmtType;
_diskCacheMode = diskCacheMode.NONE;
_sourcePath = diskName;
_sourceHost = sourceHost;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14689d78/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 50671fa..3525d12 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -930,13 +930,13 @@ public class KVMStorageProcessor implements StorageProcessor {
diskdef = new DiskDef();
if (attachingPool.getType() == StoragePoolType.RBD) {
diskdef.defNetworkBasedDisk(attachingDisk.getPath(), attachingPool.getSourceHost(), attachingPool.getSourcePort(), attachingPool.getAuthUserName(),
- attachingPool.getUuid(), devId, DiskDef.diskBus.VIRTIO, diskProtocol.RBD);
+ attachingPool.getUuid(), devId, DiskDef.diskBus.VIRTIO, diskProtocol.RBD, DiskDef.diskFmtType.RAW);
} else if (attachingPool.getType() == StoragePoolType.Gluster) {
String mountpoint = attachingPool.getLocalPath();
String path = attachingDisk.getPath();
String glusterVolume = attachingPool.getSourceDir().replace("/", "");
diskdef.defNetworkBasedDisk(glusterVolume + path.replace(mountpoint, ""), attachingPool.getSourceHost(), attachingPool.getSourcePort(), null,
- null, devId, DiskDef.diskBus.VIRTIO, diskProtocol.GLUSTER);
+ null, devId, DiskDef.diskBus.VIRTIO, diskProtocol.GLUSTER, DiskDef.diskFmtType.QCOW2);
} else if (attachingDisk.getFormat() == PhysicalDiskFormat.QCOW2) {
diskdef.defFileBasedDisk(attachingDisk.getPath(), devId, DiskDef.diskBus.VIRTIO, DiskDef.diskFmtType.QCOW2);
} else if (attachingDisk.getFormat() == PhysicalDiskFormat.RAW) {
[21/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Fix the developer database deploy procedure so it includes the mysql database driver
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e883877c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e883877c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e883877c
Branch: refs/heads/acl-item-cidrs
Commit: e883877c7a6f9df04b572afd4ee5f10d265bcc3a
Parents: 505da76
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Feb 25 11:58:02 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 25 11:58:02 2014 +0100
----------------------------------------------------------------------
developer/pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e883877c/developer/pom.xml
----------------------------------------------------------------------
diff --git a/developer/pom.xml b/developer/pom.xml
index 4a1733a..a5e2dc8 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -108,6 +108,14 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
+ <dependencies>
+ <!-- specify the dependent jdbc driver here -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${cs.mysql.version}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<phase>process-resources</phase>
@@ -119,6 +127,7 @@
</executions>
<configuration>
<mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
+ <includePluginDependencies>true</includePluginDependencies>
<arguments>
<!-- db properties file -->
<argument>${basedir}/../utils/conf/db.properties</argument>
[07/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VDI.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VDI.java b/deps/XenServerJava/src/com/xensource/xenapi/VDI.java
index 992a6a6..cf8d3ec 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VDI.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VDI.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VDI extends XenAPIObject {
* For internal use only.
*/
VDI(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VDI extends XenAPIObject {
{
if (obj != null && obj instanceof VDI)
{
- VDI other = (VDI)obj;
+ VDI other = (VDI) obj;
return other.ref.equals(this.ref);
} else
{
@@ -135,8 +136,8 @@ public class VDI extends XenAPIObject {
/**
* Convert a VDI.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -235,7 +236,7 @@ public class VDI extends XenAPIObject {
*/
public String location;
/**
- *
+ *
*/
public Boolean managed;
/**
@@ -298,15 +299,15 @@ public class VDI extends XenAPIObject {
* @return all fields from the object
*/
public VDI.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDIRecord(result);
+ return Types.toVDIRecord(result);
}
/**
@@ -316,15 +317,15 @@ public class VDI extends XenAPIObject {
* @return reference to the object
*/
public static VDI getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -334,9 +335,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, VDI.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -353,16 +354,16 @@ public class VDI extends XenAPIObject {
* @return reference to the newly created object
*/
public static VDI create(Connection c, VDI.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -371,9 +372,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -387,9 +388,9 @@ public class VDI extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -404,15 +405,15 @@ public class VDI extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<VDI> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVDI(result);
+ return Types.toSetOfVDI(result);
}
/**
@@ -421,15 +422,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -438,15 +439,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -455,15 +456,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -472,15 +473,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Set<Types.VdiOperations> getAllowedOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_allowed_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVdiOperations(result);
+ return Types.toSetOfVdiOperations(result);
}
/**
@@ -489,15 +490,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Map<String, Types.VdiOperations> getCurrentOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_current_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringVdiOperations(result);
+ return Types.toMapOfStringVdiOperations(result);
}
/**
@@ -506,15 +507,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public SR getSR(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_SR";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -523,15 +524,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Set<VBD> getVBDs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_VBDs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVBD(result);
+ return Types.toSetOfVBD(result);
}
/**
@@ -540,15 +541,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Set<Crashdump> getCrashDumps(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_crash_dumps";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfCrashdump(result);
+ return Types.toSetOfCrashdump(result);
}
/**
@@ -557,15 +558,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Long getVirtualSize(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_virtual_size";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -574,15 +575,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Long getPhysicalUtilisation(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_physical_utilisation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -591,15 +592,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Types.VdiType getType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVdiType(result);
+ return Types.toVdiType(result);
}
/**
@@ -608,15 +609,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Boolean getSharable(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_sharable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -625,15 +626,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Boolean getReadOnly(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_read_only";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -642,15 +643,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -659,15 +660,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Boolean getStorageLock(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_storage_lock";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -676,15 +677,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public String getLocation(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_location";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -693,15 +694,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Boolean getManaged(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_managed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -710,15 +711,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Boolean getMissing(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_missing";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -727,15 +728,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public VDI getParent(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_parent";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -744,15 +745,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getXenstoreData(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_xenstore_data";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -761,15 +762,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getSmConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_sm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -778,15 +779,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Boolean getIsASnapshot(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_is_a_snapshot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -795,15 +796,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public VDI getSnapshotOf(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_snapshot_of";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -812,15 +813,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Set<VDI> getSnapshots(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_snapshots";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVDI(result);
+ return Types.toSetOfVDI(result);
}
/**
@@ -829,15 +830,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Date getSnapshotTime(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_snapshot_time";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -846,15 +847,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Set<String> getTags(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -863,15 +864,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Boolean getAllowCaching(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_allow_caching";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -880,15 +881,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Types.OnBoot getOnBoot(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_on_boot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toOnBoot(result);
+ return Types.toOnBoot(result);
}
/**
@@ -897,15 +898,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Pool getMetadataOfPool(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_metadata_of_pool";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPool(result);
+ return Types.toPool(result);
}
/**
@@ -914,15 +915,15 @@ public class VDI extends XenAPIObject {
* @return value of the field
*/
public Boolean getMetadataLatest(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_metadata_latest";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -931,9 +932,9 @@ public class VDI extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -948,9 +949,9 @@ public class VDI extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -964,9 +965,9 @@ public class VDI extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -980,9 +981,9 @@ public class VDI extends XenAPIObject {
* @param xenstoreData New value to set
*/
public void setXenstoreData(Connection c, Map<String, String> xenstoreData) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_xenstore_data";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(xenstoreData)};
@@ -997,9 +998,9 @@ public class VDI extends XenAPIObject {
* @param value Value to add
*/
public void addToXenstoreData(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.add_to_xenstore_data";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -1013,9 +1014,9 @@ public class VDI extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromXenstoreData(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.remove_from_xenstore_data";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -1029,9 +1030,9 @@ public class VDI extends XenAPIObject {
* @param smConfig New value to set
*/
public void setSmConfig(Connection c, Map<String, String> smConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_sm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(smConfig)};
@@ -1046,9 +1047,9 @@ public class VDI extends XenAPIObject {
* @param value Value to add
*/
public void addToSmConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.add_to_sm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -1062,9 +1063,9 @@ public class VDI extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromSmConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.remove_from_sm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -1078,9 +1079,9 @@ public class VDI extends XenAPIObject {
* @param tags New value to set
*/
public void setTags(Connection c, Set<String> tags) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(tags)};
@@ -1094,9 +1095,9 @@ public class VDI extends XenAPIObject {
* @param value New value to add
*/
public void addTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.add_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1110,9 +1111,9 @@ public class VDI extends XenAPIObject {
* @param value Value to remove
*/
public void removeTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.remove_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1127,38 +1128,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task snapshotAsync(Connection c, Map<String, String> driverParams) throws
- BadServerResponse,
- VersionException,
- XenAPIException,
- XmlRpcException {
-
- if (c.rioConnection) {
- if (driverParams.isEmpty()) {
- return rioSnapshotAsync(c);
- } else {
- throw new Types.VersionException("driverParams parameter must be empty map for Rio (legacy XenServer) host");
- }
- } else {
- return miamiSnapshotAsync(c, driverParams);
- }
- }
-
- private Task rioSnapshotAsync(Connection c) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
- String method_call = "Async.VDI.snapshot";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toTask(result);
- }
-
- private Task miamiSnapshotAsync(Connection c, Map<String, String> driverParams) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.snapshot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(driverParams)};
@@ -1174,44 +1146,15 @@ public class VDI extends XenAPIObject {
* @return The ID of the newly created VDI.
*/
public VDI snapshot(Connection c, Map<String, String> driverParams) throws
- BadServerResponse,
- VersionException,
- XenAPIException,
- XmlRpcException {
-
- if (c.rioConnection) {
- if (driverParams.isEmpty()) {
- return rioSnapshot(c);
- } else {
- throw new Types.VersionException("driverParams parameter must be empty map for Rio (legacy XenServer) host");
- }
- } else {
- return miamiSnapshot(c, driverParams);
- }
- }
-
- private VDI rioSnapshot(Connection c) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
- String method_call = "VDI.snapshot";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toVDI(result);
- }
-
- private VDI miamiSnapshot(Connection c, Map<String, String> driverParams) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.snapshot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(driverParams)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -1221,38 +1164,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task createCloneAsync(Connection c, Map<String, String> driverParams) throws
- BadServerResponse,
- VersionException,
- XenAPIException,
- XmlRpcException {
-
- if (c.rioConnection) {
- if (driverParams.isEmpty()) {
- return rioCreateCloneAsync(c);
- } else {
- throw new Types.VersionException("driverParams parameter must be empty map for Rio (legacy XenServer) host");
- }
- } else {
- return miamiCreateCloneAsync(c, driverParams);
- }
- }
-
- private Task rioCreateCloneAsync(Connection c) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
- String method_call = "Async.VDI.clone";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toTask(result);
- }
-
- private Task miamiCreateCloneAsync(Connection c, Map<String, String> driverParams) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.clone";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(driverParams)};
@@ -1268,44 +1182,15 @@ public class VDI extends XenAPIObject {
* @return The ID of the newly created VDI.
*/
public VDI createClone(Connection c, Map<String, String> driverParams) throws
- BadServerResponse,
- VersionException,
- XenAPIException,
- XmlRpcException {
-
- if (c.rioConnection) {
- if (driverParams.isEmpty()) {
- return rioCreateClone(c);
- } else {
- throw new Types.VersionException("driverParams parameter must be empty map for Rio (legacy XenServer) host");
- }
- } else {
- return miamiCreateClone(c, driverParams);
- }
- }
-
- private VDI rioCreateClone(Connection c) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
- String method_call = "VDI.clone";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toVDI(result);
- }
-
- private VDI miamiCreateClone(Connection c, Map<String, String> driverParams) throws
- BadServerResponse,
- XmlRpcException,
- XenAPIException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.clone";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(driverParams)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -1315,9 +1200,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task resizeAsync(Connection c, Long size) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.resize";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(size)};
@@ -1332,9 +1217,9 @@ public class VDI extends XenAPIObject {
* @param size The new size of the VDI
*/
public void resize(Connection c, Long size) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.resize";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(size)};
@@ -1349,9 +1234,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task resizeOnlineAsync(Connection c, Long size) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.resize_online";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(size)};
@@ -1366,9 +1251,9 @@ public class VDI extends XenAPIObject {
* @param size The new size of the VDI
*/
public void resizeOnline(Connection c, Long size) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.resize_online";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(size)};
@@ -1399,20 +1284,14 @@ public class VDI extends XenAPIObject {
* @param snapshotOf Storage-specific config
* @return Task
*/
- public static Task introduceAsync(Connection c, String uuid, String nameLabel, String nameDescription, SR SR, Types.VdiType type, Boolean sharable, Boolean readOnly,
- Map<String, String> otherConfig, String location, Map<String, String> xenstoreData, Map<String, String> smConfig, Boolean managed, Long virtualSize,
- Long physicalUtilisation, Pool metadataOfPool, Boolean isASnapshot, Date snapshotTime, VDI snapshotOf) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SrOperationNotSupported {
+ public static Task introduceAsync(Connection c, String uuid, String nameLabel, String nameDescription, SR SR, Types.VdiType type, Boolean sharable, Boolean readOnly, Map<String, String> otherConfig, String location, Map<String, String> xenstoreData, Map<String, String> smConfig, Boolean managed, Long virtualSize, Long physicalUtilisation, Pool metadataOfPool, Boolean isASnapshot, Date snapshotTime, VDI snapshotOf) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrOperationNotSupported {
String method_call = "Async.VDI.introduce";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription),
- Marshalling.toXMLRPC(SR), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(sharable), Marshalling.toXMLRPC(readOnly), Marshalling.toXMLRPC(otherConfig),
- Marshalling.toXMLRPC(location), Marshalling.toXMLRPC(xenstoreData), Marshalling.toXMLRPC(smConfig), Marshalling.toXMLRPC(managed),
- Marshalling.toXMLRPC(virtualSize), Marshalling.toXMLRPC(physicalUtilisation), Marshalling.toXMLRPC(metadataOfPool), Marshalling.toXMLRPC(isASnapshot),
- Marshalling.toXMLRPC(snapshotTime), Marshalling.toXMLRPC(snapshotOf)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(SR), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(sharable), Marshalling.toXMLRPC(readOnly), Marshalling.toXMLRPC(otherConfig), Marshalling.toXMLRPC(location), Marshalling.toXMLRPC(xenstoreData), Marshalling.toXMLRPC(smConfig), Marshalling.toXMLRPC(managed), Marshalling.toXMLRPC(virtualSize), Marshalling.toXMLRPC(physicalUtilisation), Marshalling.toXMLRPC(metadataOfPool), Marshalling.toXMLRPC(isASnapshot), Marshalling.toXMLRPC(snapshotTime), Marshalling.toXMLRPC(snapshotOf)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1441,23 +1320,17 @@ public class VDI extends XenAPIObject {
* @param snapshotOf Storage-specific config
* @return The ref of the newly created VDI record.
*/
- public static VDI introduce(Connection c, String uuid, String nameLabel, String nameDescription, SR SR, Types.VdiType type, Boolean sharable, Boolean readOnly,
- Map<String, String> otherConfig, String location, Map<String, String> xenstoreData, Map<String, String> smConfig, Boolean managed, Long virtualSize,
- Long physicalUtilisation, Pool metadataOfPool, Boolean isASnapshot, Date snapshotTime, VDI snapshotOf) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SrOperationNotSupported {
+ public static VDI introduce(Connection c, String uuid, String nameLabel, String nameDescription, SR SR, Types.VdiType type, Boolean sharable, Boolean readOnly, Map<String, String> otherConfig, String location, Map<String, String> xenstoreData, Map<String, String> smConfig, Boolean managed, Long virtualSize, Long physicalUtilisation, Pool metadataOfPool, Boolean isASnapshot, Date snapshotTime, VDI snapshotOf) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrOperationNotSupported {
String method_call = "VDI.introduce";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription),
- Marshalling.toXMLRPC(SR), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(sharable), Marshalling.toXMLRPC(readOnly), Marshalling.toXMLRPC(otherConfig),
- Marshalling.toXMLRPC(location), Marshalling.toXMLRPC(xenstoreData), Marshalling.toXMLRPC(smConfig), Marshalling.toXMLRPC(managed),
- Marshalling.toXMLRPC(virtualSize), Marshalling.toXMLRPC(physicalUtilisation), Marshalling.toXMLRPC(metadataOfPool), Marshalling.toXMLRPC(isASnapshot),
- Marshalling.toXMLRPC(snapshotTime), Marshalling.toXMLRPC(snapshotOf)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(SR), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(sharable), Marshalling.toXMLRPC(readOnly), Marshalling.toXMLRPC(otherConfig), Marshalling.toXMLRPC(location), Marshalling.toXMLRPC(xenstoreData), Marshalling.toXMLRPC(smConfig), Marshalling.toXMLRPC(managed), Marshalling.toXMLRPC(virtualSize), Marshalling.toXMLRPC(physicalUtilisation), Marshalling.toXMLRPC(metadataOfPool), Marshalling.toXMLRPC(isASnapshot), Marshalling.toXMLRPC(snapshotTime), Marshalling.toXMLRPC(snapshotOf)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -1483,19 +1356,13 @@ public class VDI extends XenAPIObject {
* @param snapshotOf Storage-specific config
* @return Task
*/
- public static Task dbIntroduceAsync(Connection c, String uuid, String nameLabel, String nameDescription, SR SR, Types.VdiType type, Boolean sharable,
- Boolean readOnly, Map<String, String> otherConfig, String location, Map<String, String> xenstoreData, Map<String, String> smConfig, Boolean managed,
- Long virtualSize, Long physicalUtilisation, Pool metadataOfPool, Boolean isASnapshot, Date snapshotTime, VDI snapshotOf) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ public static Task dbIntroduceAsync(Connection c, String uuid, String nameLabel, String nameDescription, SR SR, Types.VdiType type, Boolean sharable, Boolean readOnly, Map<String, String> otherConfig, String location, Map<String, String> xenstoreData, Map<String, String> smConfig, Boolean managed, Long virtualSize, Long physicalUtilisation, Pool metadataOfPool, Boolean isASnapshot, Date snapshotTime, VDI snapshotOf) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.db_introduce";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription),
- Marshalling.toXMLRPC(SR), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(sharable), Marshalling.toXMLRPC(readOnly), Marshalling.toXMLRPC(otherConfig),
- Marshalling.toXMLRPC(location), Marshalling.toXMLRPC(xenstoreData), Marshalling.toXMLRPC(smConfig), Marshalling.toXMLRPC(managed),
- Marshalling.toXMLRPC(virtualSize), Marshalling.toXMLRPC(physicalUtilisation), Marshalling.toXMLRPC(metadataOfPool), Marshalling.toXMLRPC(isASnapshot),
- Marshalling.toXMLRPC(snapshotTime), Marshalling.toXMLRPC(snapshotOf)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(SR), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(sharable), Marshalling.toXMLRPC(readOnly), Marshalling.toXMLRPC(otherConfig), Marshalling.toXMLRPC(location), Marshalling.toXMLRPC(xenstoreData), Marshalling.toXMLRPC(smConfig), Marshalling.toXMLRPC(managed), Marshalling.toXMLRPC(virtualSize), Marshalling.toXMLRPC(physicalUtilisation), Marshalling.toXMLRPC(metadataOfPool), Marshalling.toXMLRPC(isASnapshot), Marshalling.toXMLRPC(snapshotTime), Marshalling.toXMLRPC(snapshotOf)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1524,22 +1391,16 @@ public class VDI extends XenAPIObject {
* @param snapshotOf Storage-specific config
* @return The ref of the newly created VDI record.
*/
- public static VDI dbIntroduce(Connection c, String uuid, String nameLabel, String nameDescription, SR SR, Types.VdiType type, Boolean sharable, Boolean readOnly,
- Map<String, String> otherConfig, String location, Map<String, String> xenstoreData, Map<String, String> smConfig, Boolean managed, Long virtualSize,
- Long physicalUtilisation, Pool metadataOfPool, Boolean isASnapshot, Date snapshotTime, VDI snapshotOf) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ public static VDI dbIntroduce(Connection c, String uuid, String nameLabel, String nameDescription, SR SR, Types.VdiType type, Boolean sharable, Boolean readOnly, Map<String, String> otherConfig, String location, Map<String, String> xenstoreData, Map<String, String> smConfig, Boolean managed, Long virtualSize, Long physicalUtilisation, Pool metadataOfPool, Boolean isASnapshot, Date snapshotTime, VDI snapshotOf) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.db_introduce";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription),
- Marshalling.toXMLRPC(SR), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(sharable), Marshalling.toXMLRPC(readOnly), Marshalling.toXMLRPC(otherConfig),
- Marshalling.toXMLRPC(location), Marshalling.toXMLRPC(xenstoreData), Marshalling.toXMLRPC(smConfig), Marshalling.toXMLRPC(managed),
- Marshalling.toXMLRPC(virtualSize), Marshalling.toXMLRPC(physicalUtilisation), Marshalling.toXMLRPC(metadataOfPool), Marshalling.toXMLRPC(isASnapshot),
- Marshalling.toXMLRPC(snapshotTime), Marshalling.toXMLRPC(snapshotOf)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid), Marshalling.toXMLRPC(nameLabel), Marshalling.toXMLRPC(nameDescription), Marshalling.toXMLRPC(SR), Marshalling.toXMLRPC(type), Marshalling.toXMLRPC(sharable), Marshalling.toXMLRPC(readOnly), Marshalling.toXMLRPC(otherConfig), Marshalling.toXMLRPC(location), Marshalling.toXMLRPC(xenstoreData), Marshalling.toXMLRPC(smConfig), Marshalling.toXMLRPC(managed), Marshalling.toXMLRPC(virtualSize), Marshalling.toXMLRPC(physicalUtilisation), Marshalling.toXMLRPC(metadataOfPool), Marshalling.toXMLRPC(isASnapshot), Marshalling.toXMLRPC(snapshotTime), Marshalling.toXMLRPC(snapshotOf)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -1548,9 +1409,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task dbForgetAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.db_forget";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1564,9 +1425,9 @@ public class VDI extends XenAPIObject {
*
*/
public void dbForget(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.db_forget";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1580,10 +1441,10 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task updateAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SrOperationNotSupported {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrOperationNotSupported {
String method_call = "Async.VDI.update";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1597,10 +1458,10 @@ public class VDI extends XenAPIObject {
*
*/
public void update(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.SrOperationNotSupported {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.SrOperationNotSupported {
String method_call = "VDI.update";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1609,38 +1470,15 @@ public class VDI extends XenAPIObject {
}
/**
- * Copy either a full VDI or the block differences between two VDIs into either a fresh VDI or an existing VDI.
- *
- * @param sr The destination SR (only required if the destination VDI is not specified
- * @param baseVdi The base VDI (only required if copying only changed blocks, by default all blocks will be copied)
- * @param intoVdi The destination VDI to copy blocks into (if omitted then a destination SR must be provided and a fresh VDI will be created)
- * @return Task
- */
- public Task copyAsync2(Connection c, SR sr, VDI baseVdi, VDI intoVdi) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VdiReadonly,
- Types.VdiTooSmall,
- Types.VdiNotSparse {
- String method_call = "Async.VDI.copy";
- String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(sr), Marshalling.toXMLRPC(baseVdi), Marshalling.toXMLRPC(intoVdi)};
- Map response = c.dispatch(method_call, method_params);
- Object result = response.get("Value");
- return Types.toTask(result);
- }
-
- /**
* Make a fresh VDI in the specified SR and copy the supplied VDI's data to the new disk
*
* @param sr The destination SR
* @return Task
*/
public Task copyAsync(Connection c, SR sr) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.copy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(sr)};
@@ -1656,15 +1494,15 @@ public class VDI extends XenAPIObject {
* @return The reference of the newly created VDI.
*/
public VDI copy(Connection c, SR sr) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.copy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(sr)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -1673,9 +1511,9 @@ public class VDI extends XenAPIObject {
* @param value The new value of the VDI's managed field
*/
public void setManaged(Connection c, Boolean value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_managed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1689,9 +1527,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task forgetAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.forget";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1705,9 +1543,9 @@ public class VDI extends XenAPIObject {
*
*/
public void forget(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.forget";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1721,9 +1559,9 @@ public class VDI extends XenAPIObject {
* @param value The new value of the VDI's sharable field
*/
public void setSharable(Connection c, Boolean value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_sharable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1737,9 +1575,9 @@ public class VDI extends XenAPIObject {
* @param value The new value of the VDI's read_only field
*/
public void setReadOnly(Connection c, Boolean value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_read_only";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1753,9 +1591,9 @@ public class VDI extends XenAPIObject {
* @param value The new value of the VDI's missing field
*/
public void setMissing(Connection c, Boolean value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_missing";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1769,9 +1607,9 @@ public class VDI extends XenAPIObject {
* @param value The new value of the VDI's virtual size
*/
public void setVirtualSize(Connection c, Long value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_virtual_size";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1785,9 +1623,9 @@ public class VDI extends XenAPIObject {
* @param value The new value of the VDI's physical utilisation
*/
public void setPhysicalUtilisation(Connection c, Long value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_physical_utilisation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1801,9 +1639,9 @@ public class VDI extends XenAPIObject {
* @param value The new value indicating whether this VDI is a snapshot
*/
public void setIsASnapshot(Connection c, Boolean value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_is_a_snapshot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1817,9 +1655,9 @@ public class VDI extends XenAPIObject {
* @param value The VDI of which this VDI is a snapshot
*/
public void setSnapshotOf(Connection c, VDI value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_snapshot_of";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1833,9 +1671,9 @@ public class VDI extends XenAPIObject {
* @param value The snapshot time of this VDI.
*/
public void setSnapshotTime(Connection c, Date value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_snapshot_time";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1849,9 +1687,9 @@ public class VDI extends XenAPIObject {
* @param value The pool whose metadata is contained by this VDI
*/
public void setMetadataOfPool(Connection c, Pool value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_metadata_of_pool";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1866,9 +1704,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task setNameLabelAsync(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1883,9 +1721,9 @@ public class VDI extends XenAPIObject {
* @param value The name lable for the VDI
*/
public void setNameLabel(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1900,9 +1738,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task setNameDescriptionAsync(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1917,9 +1755,9 @@ public class VDI extends XenAPIObject {
* @param value The name description for the VDI
*/
public void setNameDescription(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1934,9 +1772,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task setOnBootAsync(Connection c, Types.OnBoot value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.set_on_boot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1951,9 +1789,9 @@ public class VDI extends XenAPIObject {
* @param value The value to set
*/
public void setOnBoot(Connection c, Types.OnBoot value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_on_boot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1968,9 +1806,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task setAllowCachingAsync(Connection c, Boolean value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.set_allow_caching";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1985,9 +1823,9 @@ public class VDI extends XenAPIObject {
* @param value The value to set
*/
public void setAllowCaching(Connection c, Boolean value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.set_allow_caching";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -2001,9 +1839,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task openDatabaseAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.open_database";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2018,15 +1856,15 @@ public class VDI extends XenAPIObject {
* @return A session which can be used to query the database
*/
public Session openDatabase(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.open_database";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSession(result);
+ return Types.toSession(result);
}
/**
@@ -2035,9 +1873,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task readDatabasePoolUuidAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.read_database_pool_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2052,15 +1890,15 @@ public class VDI extends XenAPIObject {
* @return The cached pool UUID of the database on the VDI.
*/
public String readDatabasePoolUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.read_database_pool_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -2071,9 +1909,9 @@ public class VDI extends XenAPIObject {
* @return Task
*/
public Task poolMigrateAsync(Connection c, SR sr, Map<String, String> options) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VDI.pool_migrate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(sr), Marshalling.toXMLRPC(options)};
@@ -2090,15 +1928,15 @@ public class VDI extends XenAPIObject {
* @return The new reference of the migrated VDI.
*/
public VDI poolMigrate(Connection c, SR sr, Map<String, String> options) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.pool_migrate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(sr), Marshalling.toXMLRPC(options)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -2107,15 +1945,15 @@ public class VDI extends XenAPIObject {
* @return references to all objects
*/
public static Set<VDI> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVDI(result);
+ return Types.toSetOfVDI(result);
}
/**
@@ -2124,15 +1962,15 @@ public class VDI extends XenAPIObject {
* @return records of all objects
*/
public static Map<VDI, VDI.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VDI.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVDIVDIRecord(result);
+ return Types.toMapOfVDIVDIRecord(result);
}
}
\ No newline at end of file
[43/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Provide separate option for Windows Server 2012 R2 as
an OS type when registering template.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b484b482
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b484b482
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b484b482
Branch: refs/heads/acl-item-cidrs
Commit: b484b482019338afed864dcafa9654f3071fcfa7
Parents: 986813d
Author: Min Chen <mi...@citrix.com>
Authored: Tue Feb 25 16:09:29 2014 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Feb 25 16:09:29 2014 -0800
----------------------------------------------------------------------
.../hypervisor/xen/resource/CitrixHelper.java | 339 +++++++++++++++++++
.../xen/resource/Xenserver625Resource.java | 15 +-
setup/db/db/schema-421to430.sql | 3 +
setup/db/templates.sql | 3 +
.../vmware/util/VmwareGuestOsMapper.java | 1 +
5 files changed, 355 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b484b482/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
index 2524bc3..6c1e9a8 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
@@ -27,6 +27,7 @@ import org.apache.log4j.Logger;
*/
public class CitrixHelper {
private static final Logger s_logger = Logger.getLogger(CitrixHelper.class);
+
private static final HashMap<String, String> Xcp100GuestOsMap = new HashMap<String, String>(70);
private static final HashMap<String, String> Xcp160GuestOsMap = new HashMap<String, String>(70);
private static final HashMap<String, String> XenServerGuestOsMap = new HashMap<String, String>(70);
@@ -36,7 +37,9 @@ public class CitrixHelper {
private static final HashMap<String, String> XenServer602GuestOsMap = new HashMap<String, String>(70);
private static final HashMap<String, String> XenServer610GuestOsMap = new HashMap<String, String>(70);
private static final HashMap<String, String> XenServer620GuestOsMap = new HashMap<String, String>(70);
+ private static final HashMap<String, String> XenServer625GuestOsMap = new HashMap<String, String>(70);
private static final HashMap<String, MemoryValues> XenServer620GuestOsMemoryMap = new HashMap<String, MemoryValues>(70);
+ private static final HashMap<String, MemoryValues> XenServer625GuestOsMemoryMap = new HashMap<String, MemoryValues>(70);
private static final HashMap<String, MemoryValues> XenServer610GuestOsMemoryMap = new HashMap<String, MemoryValues>(70);
private static final HashMap<String, MemoryValues> XenServer602GuestOsMemoryMap = new HashMap<String, MemoryValues>(70);
private static final HashMap<String, MemoryValues> XenServer600GuestOsMemoryMap = new HashMap<String, MemoryValues>(70);
@@ -1528,6 +1531,168 @@ public class CitrixHelper {
XenServer620GuestOsMap.put("Other PV (64-bit)", "CentOS 5 (64-bit)");
}
+ static {
+ XenServer625GuestOsMap.put("CentOS 4.5 (32-bit)", "CentOS 4.5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 4.6 (32-bit)", "CentOS 4.6 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 4.7 (32-bit)", "CentOS 4.7 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 4.8 (32-bit)", "CentOS 4.8 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.0 (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.0 (64-bit)", "CentOS 5 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.1 (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.1 (64-bit)", "CentOS 5 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.2 (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.2 (64-bit)", "CentOS 5 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.3 (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.3 (64-bit)", "CentOS 5 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.4 (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.4 (64-bit)", "CentOS 5 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.5 (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.5 (64-bit)", "CentOS 5 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.6 (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.6 (64-bit)", "CentOS 5 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.7 (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.7 (64-bit)", "CentOS 5 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.8 (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.8 (64-bit)", "CentOS 5 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.9 (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 5.9 (64-bit)", "CentOS 5 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 6.0 (32-bit)", "CentOS 6 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 6.0 (64-bit)", "CentOS 6 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 6.1 (32-bit)", "CentOS 6 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 6.1 (64-bit)", "CentOS 6 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 6.2 (32-bit)", "CentOS 6 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 6.2 (64-bit)", "CentOS 6 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 6.3 (32-bit)", "CentOS 6 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 6.3 (64-bit)", "CentOS 6 (64-bit)");
+ XenServer625GuestOsMap.put("CentOS 6.4 (32-bit)", "CentOS 6 (32-bit)");
+ XenServer625GuestOsMap.put("CentOS 6.4 (64-bit)", "CentOS 6 (64-bit)");
+ XenServer625GuestOsMap.put("Debian GNU/Linux 6(32-bit)", "Debian Squeeze 6.0 (32-bit)");
+ XenServer625GuestOsMap.put("Debian GNU/Linux 6(64-bit)", "Debian Squeeze 6.0 (64-bit)");
+ XenServer625GuestOsMap.put("Debian GNU/Linux 7(32-bit)", "Debian Wheezy 7.0 (32-bit)");
+ XenServer625GuestOsMap.put("Debian GNU/Linux 7(64-bit)", "Debian Wheezy 7.0 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.0 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.0 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.1 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.1 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.2 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.2 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.3 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.3 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.4 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.4 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.5 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.5 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.6 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.6 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.7 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.7 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.8 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.8 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.9 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 5.9 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 6.0 (32-bit)", "Oracle Enterprise Linux 6 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 6.0 (64-bit)", "Oracle Enterprise Linux 6 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 6.1 (32-bit)", "Oracle Enterprise Linux 6 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 6.1 (64-bit)", "Oracle Enterprise Linux 6 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 6.2 (32-bit)", "Oracle Enterprise Linux 6 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 6.2 (64-bit)", "Oracle Enterprise Linux 6 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 6.3 (32-bit)", "Oracle Enterprise Linux 6 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 6.3 (64-bit)", "Oracle Enterprise Linux 6 (64-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 6.4 (32-bit)", "Oracle Enterprise Linux 6 (32-bit)");
+ XenServer625GuestOsMap.put("Oracle Enterprise Linux 6.4 (64-bit)", "Oracle Enterprise Linux 6 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 4.5 (32-bit)", "Red Hat Enterprise Linux 4.5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 4.6 (32-bit)", "Red Hat Enterprise Linux 4.6 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 4.7 (32-bit)", "Red Hat Enterprise Linux 4.7 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 4.8 (32-bit)", "Red Hat Enterprise Linux 4.8 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.0 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.0 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.1 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.1 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.2 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.2 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.3 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.3 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.4 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.4 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.5 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.5 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.6 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.6 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.7 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.7 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.8 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.8 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.9 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 5.9 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 6.0 (32-bit)", "Red Hat Enterprise Linux 6 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 6.0 (64-bit)", "Red Hat Enterprise Linux 6 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 6.1 (32-bit)", "Red Hat Enterprise Linux 6 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 6.1 (64-bit)", "Red Hat Enterprise Linux 6 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 6.2 (32-bit)", "Red Hat Enterprise Linux 6 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 6.2 (64-bit)", "Red Hat Enterprise Linux 6 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 6.3 (32-bit)", "Red Hat Enterprise Linux 6 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 6.3 (64-bit)", "Red Hat Enterprise Linux 6 (64-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 6.4 (32-bit)", "Red Hat Enterprise Linux 6 (32-bit)");
+ XenServer625GuestOsMap.put("Red Hat Enterprise Linux 6.4 (64-bit)", "Red Hat Enterprise Linux 6 (64-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 10 SP1 (32-bit)", "SUSE Linux Enterprise Server 10 SP1 (32-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 10 SP1 (64-bit)", "SUSE Linux Enterprise Server 10 SP1 (64-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 10 SP2 (32-bit)", "SUSE Linux Enterprise Server 10 SP2 (32-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 10 SP2 (64-bit)", "SUSE Linux Enterprise Server 10 SP2 (64-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 10 SP3 (32-bit)", "SUSE Linux Enterprise Server 10 SP3 (32-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 10 SP3 (64-bit)", "SUSE Linux Enterprise Server 10 SP3 (64-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 10 SP4 (32-bit)", "SUSE Linux Enterprise Server 10 SP4 (32-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 10 SP4 (64-bit)", "SUSE Linux Enterprise Server 10 SP4 (64-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 11 (32-bit)", "SUSE Linux Enterprise Server 11 (32-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 11 (64-bit)", "SUSE Linux Enterprise Server 11 (64-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 11 SP1 (32-bit)", "SUSE Linux Enterprise Server 11 SP1 (32-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 11 SP1 (64-bit)", "SUSE Linux Enterprise Server 11 SP1 (64-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 11 SP2 (32-bit)", "SUSE Linux Enterprise Server 11 SP2 (32-bit)");
+ XenServer625GuestOsMap.put("SUSE Linux Enterprise Server 11 SP2 (64-bit)", "SUSE Linux Enterprise Server 11 SP2 (64-bit)");
+ XenServer625GuestOsMap.put("Windows 7 (32-bit)", "Windows 7 (32-bit)");
+ XenServer625GuestOsMap.put("Windows 7 (64-bit)", "Windows 7 (64-bit)");
+ XenServer625GuestOsMap.put("Windows 7 SP1 (32-bit)", "Windows 7 (32-bit)");
+ XenServer625GuestOsMap.put("Windows 7 SP1 (64-bit)", "Windows 7 (64-bit)");
+ XenServer625GuestOsMap.put("Windows 8 (32-bit)", "Windows 8 (32-bit)");
+ XenServer625GuestOsMap.put("Windows 8 (64-bit)", "Windows 8 (64-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2003 SP2 (32-bit)", "Windows Server 2003 (32-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2003 SP2 (64-bit)", "Windows Server 2003 (64-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2003 PAE (32-bit)", "Windows Server 2003 (32-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2003 Enterprise Edition(32-bit)", "Windows Server 2003 (32-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2003 Enterprise Edition(64-bit)", "Windows Server 2003 (64-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2003 DataCenter Edition(32-bit)", "Windows Server 2003 (32-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2003 DataCenter Edition(64-bit)", "Windows Server 2003 (64-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2003 Standard Edition(32-bit)", "Windows Server 2003 (32-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2003 Standard Edition(64-bit)", "Windows Server 2003 (64-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2008 SP2 (32-bit)", "Windows Server 2008 (34-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2008 SP2 (64-bit)", "Windows Server 2008 (64-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2008 R2 (64-bit)", "Windows Server 2008 R2 (64-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2008 R2 SP1 (64-bit)", "Windows Server 2008 R2 (64-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2012 (64-bit)", "Windows Server 2012 (64-bit)");
+ XenServer625GuestOsMap.put("Windows Server 2012 R2 (64-bit)", "Windows Server 2012 (64-bit)");
+ XenServer625GuestOsMap.put("Windows Vista SP2 (32-bit)", "Windows Vista (32-bit)");
+ XenServer625GuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)");
+ XenServer625GuestOsMap.put("Ubuntu 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit)");
+ XenServer625GuestOsMap.put("Ubuntu 10.04 (64-bit)", "Ubuntu Lucid Lynx 10.04 (64-bit)");
+ XenServer625GuestOsMap.put("Ubuntu 10.10 (32-bit)", "Ubuntu Maverick Meerkat 10.10 (32-bit) (experimental)");
+ XenServer625GuestOsMap.put("Ubuntu 10.10 (64-bit)", "Ubuntu Maverick Meerkat 10.10 (64-bit) (experimental)");
+ XenServer625GuestOsMap.put("Ubuntu 12.04 (32-bit)", "Ubuntu Precise Pangolin 12.04 (32-bit)");
+ XenServer625GuestOsMap.put("Ubuntu 12.04 (64-bit)", "Ubuntu Precise Pangolin 12.04 (64-bit)");
+ XenServer625GuestOsMap.put("Ubuntu 11.04 (32-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Ubuntu 11.04 (64-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other Linux (32-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other Linux (64-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other (32-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other (64-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other CentOS (32-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other CentOS (64-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other Ubuntu (32-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other Ubuntu (64-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other SUSE Linux(32-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other SUSE Linux(64-bit)", "Other install media");
+ XenServer625GuestOsMap.put("Other PV (32-bit)", "CentOS 5 (32-bit)");
+ XenServer625GuestOsMap.put("Other PV (64-bit)", "CentOS 5 (64-bit)");
+ }
+
public static class MemoryValues {
long max;
long min;
@@ -1819,6 +1984,150 @@ public class CitrixHelper {
XenServer620GuestOsMemoryMap.put("Ubuntu 12.04 (64-bit)", new MemoryValues(128l, 128 * 1024l));
}
+
+ static {
+ XenServer625GuestOsMemoryMap.put("CentOS 4.5 (32-bit)", new MemoryValues(256l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 4.6 (32-bit)", new MemoryValues(256l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 4.7 (32-bit)", new MemoryValues(256l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 4.8 (32-bit)", new MemoryValues(256l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.0 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.0 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.1 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.1 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.2 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.2 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.3 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.3 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.4 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.4 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.5 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.5 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.6 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.6 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.7 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.7 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.8 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.8 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.9 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 5.9 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 6.0 (32-bit)", new MemoryValues(512l, 8 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 6.0 (64-bit)", new MemoryValues(512l, 32 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 6.1 (32-bit)", new MemoryValues(512l, 8 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 6.1 (64-bit)", new MemoryValues(512l, 32 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 6.2 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 6.2 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 6.3 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 6.3 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 6.4 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("CentOS 6.4 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Debian GNU/Linux 6(32-bit)", new MemoryValues(128l, 32 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Debian GNU/Linux 6(64-bit)", new MemoryValues(128l, 32 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Debian GNU/Linux 7(32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Debian GNU/Linux 7(64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.0 (32-bit)", new MemoryValues(512l, 64 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.0 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.1 (32-bit)", new MemoryValues(512l, 64 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.1 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.2 (32-bit)", new MemoryValues(512l, 64 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.2 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.3 (32-bit)", new MemoryValues(512l, 64 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.3 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.4 (32-bit)", new MemoryValues(512l, 64 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.4 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.5 (32-bit)", new MemoryValues(512l, 64 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.5 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.6 (32-bit)", new MemoryValues(512l, 64 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.6 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.7 (32-bit)", new MemoryValues(512l, 64 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.7 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.8 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.8 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.9 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 5.9 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 6.0 (32-bit)", new MemoryValues(512l, 8 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 6.0 (64-bit)", new MemoryValues(512l, 32 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 6.1 (32-bit)", new MemoryValues(512l, 8 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 6.1 (64-bit)", new MemoryValues(512l, 32 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 6.2 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 6.2 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 6.3 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 6.3 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 6.4 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Oracle Enterprise Linux 6.4 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 4.5 (32-bit)", new MemoryValues(256l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 4.6 (32-bit)", new MemoryValues(256l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 4.7 (32-bit)", new MemoryValues(256l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 4.8 (32-bit)", new MemoryValues(256l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.0 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.0 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.1 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.1 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.2 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.2 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.3 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.3 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.4 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.4 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.5 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.5 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.6 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.6 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.7 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.7 (64-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.8 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.8 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.9 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 5.9 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 6.0 (32-bit)", new MemoryValues(512l, 8 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 6.0 (64-bit)", new MemoryValues(512l, 32 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 6.1 (32-bit)", new MemoryValues(512l, 8 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 6.1 (64-bit)", new MemoryValues(512l, 32 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 6.2 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 6.2 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 6.3 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 6.3 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 6.4 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Red Hat Enterprise Linux 6.4 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 10 SP1 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 10 SP1 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 10 SP2 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 10 SP2 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 10 SP3 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 10 SP3 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 10 SP4 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 10 SP4 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 11 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 11 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 11 SP1 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 11 SP1 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 11 SP2 (32-bit)", new MemoryValues(512l, 16 * 1024l));
+ XenServer625GuestOsMemoryMap.put("SUSE Linux Enterprise Server 11 SP2 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+
+ XenServer625GuestOsMemoryMap.put("Windows 7 (32-bit)", new MemoryValues(1024l, 4 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows 7 (64-bit)", new MemoryValues(2 * 1024l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows 7 SP1 (32-bit)", new MemoryValues(1024l, 4 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows 7 SP1 (64-bit)", new MemoryValues(2 * 1024l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows 8 (32-bit)", new MemoryValues(1024l, 4 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows 8 (64-bit)", new MemoryValues(2 * 1024l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows Server 2003 SP2 (32-bit)", new MemoryValues(256l, 64 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows Server 2003 SP2 (64-bit)", new MemoryValues(256l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows Server 2008 SP2 (32-bit)", new MemoryValues(512l, 64 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows Server 2008 SP2 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows Server 2008 R2 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows Server 2008 R2 SP1 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows Server 2012 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows Server 2012 R2 (64-bit)", new MemoryValues(512l, 128 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows Vista SP2 (32-bit)", new MemoryValues(1024l, 4 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Windows XP SP3 (32-bit)", new MemoryValues(256l, 4 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Ubuntu 10.04 (32-bit)", new MemoryValues(128l, 512l));
+ XenServer625GuestOsMemoryMap.put("Ubuntu 10.04 (64-bit)", new MemoryValues(128l, 32 * 1024l));
+ //_xenServer620GuestOsMemoryMap.put("Ubuntu 10.10 (32-bit)", new MemoryValues(512l, 16*1024l));//?
+ //_xenServer620GuestOsMemoryMap.put("Ubuntu 10.10 (64-bit)", new MemoryValues(512l, 16*1024l)); //?
+ XenServer625GuestOsMemoryMap.put("Ubuntu 12.04 (32-bit)", new MemoryValues(128l, 32 * 1024l));
+ XenServer625GuestOsMemoryMap.put("Ubuntu 12.04 (64-bit)", new MemoryValues(128l, 128 * 1024l));
+ }
+
+
public static String getXcpGuestOsType(String stdType) {
String guestOS = Xcp100GuestOsMap.get(stdType);
if (guestOS == null) {
@@ -2017,6 +2326,20 @@ public class CitrixHelper {
return guestOS;
}
+ public static String getXenServer625GuestOsType(String stdType, boolean bootFromCD) {
+ String guestOS = XenServer625GuestOsMap.get(stdType);
+ if (guestOS == null) {
+ if (!bootFromCD) {
+ s_logger.debug("Can't find the guest os: " + stdType + " mapping into XenServer 6.2.5 guestOS type, start it as HVM guest");
+ guestOS = "Other install media";
+ } else {
+ String msg = "XenServer 6.2.5 DOES NOT support Guest OS type " + stdType;
+ s_logger.warn(msg);
+ }
+ }
+ return guestOS;
+ }
+
public static long getXenServer620StaticMax(String stdType, boolean bootFromCD) {
MemoryValues recommendedMaxMinMemory = XenServer620GuestOsMemoryMap.get(stdType);
if (recommendedMaxMinMemory == null) {
@@ -2032,4 +2355,20 @@ public class CitrixHelper {
}
return recommendedMaxMinMemory.getMin();
}
+
+ public static long getXenServer625StaticMax(String stdType, boolean bootFromCD) {
+ MemoryValues recommendedMaxMinMemory = XenServer625GuestOsMemoryMap.get(stdType);
+ if (recommendedMaxMinMemory == null) {
+ return 0l;
+ }
+ return recommendedMaxMinMemory.getMax();
+ }
+
+ public static long getXenServer625StaticMin(String stdType, boolean bootFromCD) {
+ MemoryValues recommendedMaxMinMemory = XenServer625GuestOsMemoryMap.get(stdType);
+ if (recommendedMaxMinMemory == null) {
+ return 0l;
+ }
+ return recommendedMaxMinMemory.getMin();
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b484b482/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java
index 7d2a2a1..e9c3f29 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java
@@ -25,20 +25,22 @@ import java.util.Map;
import javax.ejb.Local;
-import org.apache.cloudstack.hypervisor.xenserver.XenServerResourceNewBase;
import org.apache.log4j.Logger;
+import com.xensource.xenapi.Connection;
+
+import org.apache.cloudstack.hypervisor.xenserver.XenServerResourceNewBase;
+
import com.cloud.agent.api.StartupRoutingCommand;
import com.cloud.resource.ServerResource;
import com.cloud.storage.resource.StorageSubsystemCommandHandler;
import com.cloud.storage.resource.StorageSubsystemCommandHandlerBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
-import com.xensource.xenapi.Connection;
@Local(value=ServerResource.class)
public class Xenserver625Resource extends XenServerResourceNewBase {
- private static final Logger s_logger = Logger.getLogger(XenServer620Resource.class);
+ private static final Logger s_logger = Logger.getLogger(Xenserver625Resource.class);
public Xenserver625Resource() {
super();
@@ -53,7 +55,7 @@ public class Xenserver625Resource extends XenServerResourceNewBase {
@Override
protected String getGuestOsType(String stdType, boolean bootFromCD) {
- return CitrixHelper.getXenServer620GuestOsType(stdType, bootFromCD);
+ return CitrixHelper.getXenServer625GuestOsType(stdType, bootFromCD);
}
@Override
@@ -71,7 +73,7 @@ public class Xenserver625Resource extends XenServerResourceNewBase {
@Override
public long getStaticMax(String os, boolean b, long dynamicMinRam, long dynamicMaxRam){
- long recommendedValue = CitrixHelper.getXenServer620StaticMax(os, b);
+ long recommendedValue = CitrixHelper.getXenServer625StaticMax(os, b);
if(recommendedValue == 0){
s_logger.warn("No recommended value found for dynamic max, setting static max and dynamic max equal");
return dynamicMaxRam;
@@ -86,7 +88,7 @@ public class Xenserver625Resource extends XenServerResourceNewBase {
@Override
public long getStaticMin(String os, boolean b, long dynamicMinRam, long dynamicMaxRam){
- long recommendedValue = CitrixHelper.getXenServer620StaticMin(os, b);
+ long recommendedValue = CitrixHelper.getXenServer625StaticMin(os, b);
if(recommendedValue == 0){
s_logger.warn("No recommended value found for dynamic min");
return dynamicMinRam;
@@ -109,4 +111,5 @@ public class Xenserver625Resource extends XenServerResourceNewBase {
}
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b484b482/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index a0c4506..b49fd96 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -1097,3 +1097,6 @@ CREATE VIEW `cloud`.`user_vm_view` AS
`cloud`.`user_vm_details` `custom_ram_size` ON (((`custom_ram_size`.`vm_id` = `cloud`.`vm_instance`.`id`) and (`custom_ram_size`.`name` = 'memory')));
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (168, UUID(), 6, 'Windows Server 2012 R2 (64-bit)');
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows Server 2012 R2 (64-bit)', 168);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Windows Server 2012 R2 (64-bit)', 168);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b484b482/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index a99a6cd..3299320 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -220,6 +220,7 @@ INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (164
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (165, UUID(), 6, 'Windows 8 (32-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (166, UUID(), 6, 'Windows 8 (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (167, UUID(), 6, 'Windows Server 2012 (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (168, UUID(), 6, 'Windows Server 2012 R2 (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (169, UUID(), 10, 'Ubuntu 11.04 (32-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (170, UUID(), 10, 'Ubuntu 11.04 (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (171, UUID(), 1, 'CentOS 6.3 (32-bit)');
@@ -377,6 +378,7 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows 8 (32-bit)', 165);
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows 8 (64-bit)', 166);
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows Server 2012 (64-bit)', 167);
+INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows Server 2012 R2 (64-bit)', 168);
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 7(32-bit)', 48);
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 7(64-bit)', 49);
@@ -408,6 +410,7 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Windows 8 (32-bit)', 165);
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Windows 8 (64-bit)', 166);
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Windows Server 2012 (64-bit)', 167);
+INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Windows Server 2012 R2 (64-bit)', 168);
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5.0(32-bit)', 30);
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5.1(32-bit)', 32);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b484b482/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java
index dd68737..362ddf5 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java
@@ -61,6 +61,7 @@ public class VmwareGuestOsMapper {
s_mapper.put("Windows 8 (32-bit)", VirtualMachineGuestOsIdentifier.WINDOWS_8_GUEST);
s_mapper.put("Windows 8 (64-bit)", VirtualMachineGuestOsIdentifier.WINDOWS_8_64_GUEST);
s_mapper.put("Windows Server 2012 (64-bit)", VirtualMachineGuestOsIdentifier.WINDOWS_8_SERVER_64_GUEST);
+ s_mapper.put("Windows Server 2012 R2 (64-bit)", VirtualMachineGuestOsIdentifier.WINDOWS_8_SERVER_64_GUEST);
s_mapper.put("Apple Mac OS X 10.6 (32-bit)", VirtualMachineGuestOsIdentifier.DARWIN_10_GUEST);
s_mapper.put("Apple Mac OS X 10.6 (64-bit)", VirtualMachineGuestOsIdentifier.DARWIN_10_64_GUEST);
[48/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
network acl item cidrs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/106113ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/106113ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/106113ad
Branch: refs/heads/acl-item-cidrs
Commit: 106113ada75fbb03998118fd0f8272d0bbeb5c26
Parents: e431538
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Feb 19 15:39:12 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Feb 26 18:25:40 2014 +0100
----------------------------------------------------------------------
.../network/vpc/NetworkACLItemCidrsDao.java | 39 ++++++++
.../network/vpc/NetworkACLItemCidrsVO.java | 78 ++++++++++++++++
.../cloud/network/vpc/NetworkACLItemDao.java | 2 +
.../vpc/dao/NetworkACLItemCidrsDaoImpl.java | 94 ++++++++++++++++++++
.../network/vpc/dao/NetworkACLItemDaoImpl.java | 35 ++++++++
5 files changed, 248 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/106113ad/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java
new file mode 100644
index 0000000..5e49368
--- /dev/null
+++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsDao.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.cloud.network.vpc;
+
+import java.util.List;
+
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.GenericDao;
+
+/**
+ * @author daan
+ *
+ */
+public interface NetworkACLItemCidrsDao extends GenericDao<NetworkACLItemCidrsVO, Long> {
+
+ void persist(long networkACLItemId, List<String> cidrs);
+
+ List<String> getCidrs(long networkACLItemId);
+
+ @DB
+ List<NetworkACLItemCidrsVO> listByNetworkACLItemId(long networkACLItemId);
+
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/106113ad/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsVO.java
new file mode 100644
index 0000000..6acf845
--- /dev/null
+++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemCidrsVO.java
@@ -0,0 +1,78 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.cloud.network.vpc;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.apache.cloudstack.api.InternalIdentity;
+
+/**
+ * @author daan
+ *
+ */
+public class NetworkACLItemCidrsVO implements InternalIdentity {
+ private static final long serialVersionUID = 7805284475485494754L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ private Long id;
+
+ @Column(name = "network_acl_item_id")
+ private long networkACLItemId;
+
+ @Column(name = "cidr")
+ private String cidrList;
+
+ public NetworkACLItemCidrsVO() {
+ }
+
+ public NetworkACLItemCidrsVO(long networkAclItemId, String cidrList) {
+ this.networkACLItemId = networkAclItemId;
+ this.cidrList = cidrList;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cloudstack.api.InternalIdentity#getId()
+ */
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ public long getNetworkACLItemId() {
+ return networkACLItemId;
+ }
+
+ public String getCidr() {
+ return cidrList;
+ }
+
+ public String getCidrList() {
+ return cidrList;
+ }
+
+ public void setCidrList(String cidrList) {
+ this.cidrList = cidrList;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/106113ad/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java
index e278485..9ab6365 100644
--- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java
+++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemDao.java
@@ -34,4 +34,6 @@ public interface NetworkACLItemDao extends GenericDao<NetworkACLItemVO, Long> {
int getMaxNumberByACL(long aclId);
NetworkACLItemVO findByAclAndNumber(long aclId, int number);
+
+ void loadCidrs(NetworkACLItemVO item);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/106113ad/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java
new file mode 100644
index 0000000..23c1fa7
--- /dev/null
+++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java
@@ -0,0 +1,94 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.cloud.network.vpc.dao;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ejb.Local;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import com.cloud.network.vpc.NetworkACLItemCidrsDao;
+import com.cloud.network.vpc.NetworkACLItemCidrsVO;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.TransactionLegacy;
+
+/**
+ * @author daan
+ *
+ */
+@Component
+@Local(value = NetworkACLItemCidrsDao.class)
+public class NetworkACLItemCidrsDaoImpl extends GenericDaoBase<NetworkACLItemCidrsVO, Long> implements NetworkACLItemCidrsDao {
+ private static final Logger s_logger = Logger.getLogger(NetworkACLItemCidrsDaoImpl.class);
+ protected final SearchBuilder<NetworkACLItemCidrsVO> cidrsSearch;
+
+ protected NetworkACLItemCidrsDaoImpl() {
+ cidrsSearch = createSearchBuilder();
+ cidrsSearch.and("networkAclItemId", cidrsSearch.entity().getNetworkACLItemId(), SearchCriteria.Op.EQ);
+ cidrsSearch.done();
+ }
+
+ /* (non-Javadoc)
+ * @see com.cloud.network.dao.NetworkAclItemCidrsDao#persist(long, java.util.List)
+ */
+ @Override
+ public void persist(long networkACLItemId, List<String> cidrs) {
+ TransactionLegacy txn = TransactionLegacy.currentTxn();
+
+ txn.start();
+ for (String cidr : cidrs) {
+ NetworkACLItemCidrsVO vo = new NetworkACLItemCidrsVO(networkACLItemId, cidr);
+ persist(vo);
+ }
+ txn.commit();
+ }
+
+ /* (non-Javadoc)
+ * @see com.cloud.network.dao.NetworkAclItemCidrsDao#getCidrs(long)
+ */
+ @Override
+ public List<String> getCidrs(long networkACLItemId) {
+ SearchCriteria<NetworkACLItemCidrsVO> sc = cidrsSearch.create();
+ sc.setParameters("firewallRuleId", networkACLItemId);
+
+ List<NetworkACLItemCidrsVO> results = search(sc, null);
+ List<String> cidrs = new ArrayList<String>(results.size());
+ for (NetworkACLItemCidrsVO result : results) {
+ cidrs.add(result.getCidr());
+ }
+
+ return cidrs;
+ }
+
+ @Override
+ public List<NetworkACLItemCidrsVO> listByNetworkACLItemId(long networkACLItemId) {
+ SearchCriteria<NetworkACLItemCidrsVO> sc = cidrsSearch.create();
+ sc.setParameters("firewallRuleId", networkACLItemId);
+
+ List<NetworkACLItemCidrsVO> results = search(sc, null);
+
+ return results;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/106113ad/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
index 31ff6f2..b581d3e 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
@@ -19,10 +19,13 @@ package com.cloud.network.vpc.dao;
import java.util.List;
import javax.ejb.Local;
+import javax.inject.Inject;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.network.vpc.NetworkACLItem.State;
+import com.cloud.network.vpc.NetworkACLItemCidrsDao;
import com.cloud.network.vpc.NetworkACLItemDao;
import com.cloud.network.vpc.NetworkACLItemVO;
import com.cloud.utils.db.DB;
@@ -31,17 +34,22 @@ import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = NetworkACLItemDao.class)
@DB()
public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long> implements NetworkACLItemDao {
+ private static final Logger s_logger = Logger.getLogger(NetworkACLItemDaoImpl.class);
protected final SearchBuilder<NetworkACLItemVO> AllFieldsSearch;
protected final SearchBuilder<NetworkACLItemVO> NotRevokedSearch;
protected final SearchBuilder<NetworkACLItemVO> ReleaseSearch;
protected final GenericSearchBuilder<NetworkACLItemVO, Integer> MaxNumberSearch;
+ @Inject
+ protected NetworkACLItemCidrsDao _networkACLItemCidrsDao;
+
protected NetworkACLItemDaoImpl() {
super();
@@ -115,4 +123,31 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long
sc.setParameters("number", number);
return findOneBy(sc);
}
+
+ @Override
+ @DB
+ public NetworkACLItemVO persist(NetworkACLItemVO networkAclItem) {
+ TransactionLegacy txn = TransactionLegacy.currentTxn();
+ txn.start();
+
+ NetworkACLItemVO dbNetworkACLItem = super.persist(networkAclItem);
+ saveCidrs(networkAclItem, networkAclItem.getSourceCidrList());
+ loadCidrs(dbNetworkACLItem);
+
+ txn.commit();
+ return dbNetworkACLItem;
+ }
+
+ public void saveCidrs(NetworkACLItemVO networkACLItem, List<String> cidrList) {
+ if (cidrList == null) {
+ return;
+ }
+ _networkACLItemCidrsDao.persist(networkACLItem.getId(), cidrList);
+ }
+
+ @Override
+ public void loadCidrs(NetworkACLItemVO item) {
+ List<String> cidrs = _networkACLItemCidrsDao.getCidrs(item.getId());
+ item.setSourceCidrList(cidrs);
+ }
}
[19/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
This commit replaces old XenServer SDKs with lastet XenServer release
i.e. 6.2sp1 SDKs. This SDK also includes new class "VGPU" to support
vGPU functionality in XenServer.
Signed-off-by: Hugo Trippaers <ht...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ff9abad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ff9abad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ff9abad
Branch: refs/heads/acl-item-cidrs
Commit: 2ff9abadf6e6af835f2835ea09e1d8b5421800d0
Parents: d1efdca
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Wed Jan 22 16:15:52 2014 +0530
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 25 08:55:53 2014 +0100
----------------------------------------------------------------------
deps/XenServerJava/src/LICENSE.Apache-2.0.txt | 201 +
deps/XenServerJava/src/LICENSE.txt | 26 +
deps/XenServerJava/src/README.txt | 57 +
.../src/com/xensource/xenapi/APIVersion.java | 73 +-
.../src/com/xensource/xenapi/Auth.java | 34 +-
.../src/com/xensource/xenapi/Blob.java | 149 +-
.../src/com/xensource/xenapi/Bond.java | 191 +-
.../src/com/xensource/xenapi/Connection.java | 128 +-
.../src/com/xensource/xenapi/Console.java | 135 +-
.../src/com/xensource/xenapi/Crashdump.java | 113 +-
.../src/com/xensource/xenapi/DRTask.java | 93 +-
.../src/com/xensource/xenapi/DataSource.java | 19 +-
.../src/com/xensource/xenapi/Event.java | 98 +-
.../src/com/xensource/xenapi/GPUGroup.java | 338 +-
.../src/com/xensource/xenapi/Host.java | 1208 +-
.../src/com/xensource/xenapi/HostCpu.java | 182 +-
.../src/com/xensource/xenapi/HostCrashdump.java | 133 +-
.../src/com/xensource/xenapi/HostMetrics.java | 120 +-
.../src/com/xensource/xenapi/HostPatch.java | 195 +-
.../src/com/xensource/xenapi/Marshalling.java | 60 +-
.../src/com/xensource/xenapi/Message.java | 110 +-
.../src/com/xensource/xenapi/Network.java | 275 +-
.../src/com/xensource/xenapi/PBD.java | 183 +-
.../src/com/xensource/xenapi/PCI.java | 133 +-
.../src/com/xensource/xenapi/PGPU.java | 373 +-
.../src/com/xensource/xenapi/PIF.java | 636 +-
.../src/com/xensource/xenapi/PIFMetrics.java | 173 +-
.../src/com/xensource/xenapi/Pool.java | 942 +-
.../src/com/xensource/xenapi/PoolPatch.java | 237 +-
.../src/com/xensource/xenapi/Role.java | 123 +-
.../src/com/xensource/xenapi/SM.java | 199 +-
.../src/com/xensource/xenapi/SR.java | 767 +-
.../src/com/xensource/xenapi/Secret.java | 125 +-
.../src/com/xensource/xenapi/Session.java | 227 +-
.../src/com/xensource/xenapi/Subject.java | 129 +-
.../src/com/xensource/xenapi/Task.java | 235 +-
.../src/com/xensource/xenapi/Tunnel.java | 165 +-
.../src/com/xensource/xenapi/Types.java | 10869 +++++++++--------
.../src/com/xensource/xenapi/User.java | 135 +-
.../src/com/xensource/xenapi/VBD.java | 421 +-
.../src/com/xensource/xenapi/VBDMetrics.java | 109 +-
.../src/com/xensource/xenapi/VDI.java | 866 +-
.../src/com/xensource/xenapi/VGPU.java | 225 +-
.../src/com/xensource/xenapi/VGPUType.java | 461 +
.../src/com/xensource/xenapi/VIF.java | 409 +-
.../src/com/xensource/xenapi/VIFMetrics.java | 109 +-
.../src/com/xensource/xenapi/VLAN.java | 135 +-
.../src/com/xensource/xenapi/VM.java | 2182 ++--
.../src/com/xensource/xenapi/VMAppliance.java | 241 +-
.../com/xensource/xenapi/VMGuestMetrics.java | 157 +-
.../src/com/xensource/xenapi/VMMetrics.java | 165 +-
.../src/com/xensource/xenapi/VMPP.java | 437 +-
.../src/com/xensource/xenapi/VTPM.java | 85 +-
.../src/com/xensource/xenapi/XenAPIObject.java | 44 +-
54 files changed, 13426 insertions(+), 12209 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/LICENSE.Apache-2.0.txt
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/LICENSE.Apache-2.0.txt b/deps/XenServerJava/src/LICENSE.Apache-2.0.txt
new file mode 100755
index 0000000..261eeb9
--- /dev/null
+++ b/deps/XenServerJava/src/LICENSE.Apache-2.0.txt
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/LICENSE.txt
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/LICENSE.txt b/deps/XenServerJava/src/LICENSE.txt
new file mode 100755
index 0000000..76c4a22
--- /dev/null
+++ b/deps/XenServerJava/src/LICENSE.txt
@@ -0,0 +1,26 @@
+Copyright (c) Citrix Systems, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ 1) Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2) Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/README.txt
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/README.txt b/deps/XenServerJava/src/README.txt
new file mode 100755
index 0000000..2e6fa45
--- /dev/null
+++ b/deps/XenServerJava/src/README.txt
@@ -0,0 +1,57 @@
+XenServerJava
+=============
+
+NOTE: This is a modified version of Citrix XenServer's SDK. This version of
+XenServerJava includes some customization which is required to make it work
+with CloudStack.
+
+
+Version 6.2.0-1.
+
+XenServerJava is a complete SDK for Citrix XenServer, exposing the XenServer
+API as Java classes.
+
+For XenServer documentation, see http://docs.xensource.com.
+XenServerJava includes a class for every XenServer class, and a method for
+each XenServer API call, so API documentation and examples written for
+for other languages will apply equally well to Java.
+In particular, the SDK Guide and API Documentation are ideal for developers
+wishing to use XenServerJava.
+
+For community content, blogs, and downloads, visit the XenServer Developer
+Network at http://community.citrix.com/cdn/xs.
+
+XenServerJava is free sofware. You can redistribute and modify it under the
+terms of the BSD license. See LICENSE.txt for details.
+
+This library may be accompanied by pedagogical examples. These do not form
+part of this library, and are licensed for redistribution and modification
+under the BSD license. Such examples are licensed clearly at the top
+of each file.
+
+
+Dependencies
+------------
+
+XenServerJava is dependent upon Apache XML-RPC and WS-Commons, both by The
+Apache Software Foundation. We would like to thank the ASF and the
+Apache XML-RPC development team in particular.
+Both are licensed under the Apache Software License 2.0; see
+LICENSE.Apache-2.0.txt for details.
+
+We test with version 3.1 of Apache XML-RPC, and version 1.0.2 of WS-Commons.
+We recommend that you use these versions, though others may work.
+
+
+Downloads
+---------
+
+XenServerJava is available in the XenServer-6.2.0-SDK.zip in three separate
+folders, one for the compiled binaries, one for the source code,
+and one containing sample code.
+
+The XenServer-6.2.0-SDK.zip is available from
+http://www.citrix.com/downloads/xenserver/.
+
+Apache XML-RPC is available from http://ws.apache.org/xmlrpc/.
+WS-Commons is available from http://ws.apache.org/commons/.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/APIVersion.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/APIVersion.java b/deps/XenServerJava/src/com/xensource/xenapi/APIVersion.java
old mode 100644
new mode 100755
index 8d7247d..9dcdd9f
--- a/deps/XenServerJava/src/com/xensource/xenapi/APIVersion.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/APIVersion.java
@@ -1,18 +1,19 @@
-/* Copyright (c) Citrix Systems, Inc.
+/*
+ * Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -31,16 +32,24 @@ package com.xensource.xenapi;
public enum APIVersion
{
- API_1_1, API_1_2, API_1_3, API_1_4, API_1_5, API_1_6, API_1_7, API_1_8, API_1_9, API_1_10, UNKNOWN;
+ API_1_1, API_1_2, API_1_3, API_1_4, API_1_5, API_1_6, API_1_7, API_1_8, API_1_9, API_1_10, API_2_0, API_2_1, UNKNOWN;
public static APIVersion latest()
{
- return API_1_10;
+ return API_2_1;
}
public static APIVersion fromMajorMinor(long major, long minor)
{
- if (major == 1 && minor == 10)
+ if (major == 2 && minor == 1)
+ {
+ return API_2_1;
+ }
+ else if (major == 2 && minor == 0)
+ {
+ return API_2_0;
+ }
+ else if (major == 1 && minor == 10)
{
return API_1_10;
}
@@ -91,28 +100,32 @@ public enum APIVersion
{
switch (this)
{
- case API_1_1:
- return "1.1";
- case API_1_2:
- return "1.2";
- case API_1_3:
- return "1.3";
- case API_1_4:
- return "1.4";
- case API_1_5:
- return "1.5";
- case API_1_6:
- return "1.6";
- case API_1_7:
- return "1.7";
- case API_1_8:
- return "1.8";
- case API_1_9:
- return "1.9";
- case API_1_10:
- return "1.10";
- default:
- return "Unknown";
+ case API_1_1:
+ return "1.1";
+ case API_1_2:
+ return "1.2";
+ case API_1_3:
+ return "1.3";
+ case API_1_4:
+ return "1.4";
+ case API_1_5:
+ return "1.5";
+ case API_1_6:
+ return "1.6";
+ case API_1_7:
+ return "1.7";
+ case API_1_8:
+ return "1.8";
+ case API_1_9:
+ return "1.9";
+ case API_1_10:
+ return "1.10";
+ case API_2_0:
+ return "2.0";
+ case API_2_1:
+ return "2.1";
+ default:
+ return "Unknown";
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Auth.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Auth.java b/deps/XenServerJava/src/com/xensource/xenapi/Auth.java
index cffaaac..4778e6a 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Auth.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Auth.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -51,6 +52,7 @@ import org.apache.xmlrpc.XmlRpcException;
*/
public class Auth extends XenAPIObject {
+
public String toWireString() {
return null;
}
@@ -62,15 +64,15 @@ public class Auth extends XenAPIObject {
* @return the subject_identifier obtained from the external directory service
*/
public static String getSubjectIdentifier(Connection c, String subjectName) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "auth.get_subject_identifier";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(subjectName)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -80,15 +82,15 @@ public class Auth extends XenAPIObject {
* @return key-value pairs containing at least a key called subject_name
*/
public static Map<String, String> getSubjectInformationFromIdentifier(Connection c, String subjectIdentifier) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "auth.get_subject_information_from_identifier";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(subjectIdentifier)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -98,15 +100,15 @@ public class Auth extends XenAPIObject {
* @return set of subject_identifiers that provides the group membership of subject_identifier passed as argument, it contains, recursively, all groups a subject_identifier is member of.
*/
public static Set<String> getGroupMembership(Connection c, String subjectIdentifier) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "auth.get_group_membership";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(subjectIdentifier)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Blob.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Blob.java b/deps/XenServerJava/src/com/xensource/xenapi/Blob.java
index 494b928..ec91d87 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Blob.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Blob.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Blob extends XenAPIObject {
* For internal use only.
*/
Blob(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Blob extends XenAPIObject {
{
if (obj != null && obj instanceof Blob)
{
- Blob other = (Blob)obj;
+ Blob other = (Blob) obj;
return other.ref.equals(this.ref);
} else
{
@@ -112,8 +113,8 @@ public class Blob extends XenAPIObject {
/**
* Convert a blob.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -160,15 +161,15 @@ public class Blob extends XenAPIObject {
* @return all fields from the object
*/
public Blob.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBlobRecord(result);
+ return Types.toBlobRecord(result);
}
/**
@@ -178,15 +179,15 @@ public class Blob extends XenAPIObject {
* @return reference to the object
*/
public static Blob getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBlob(result);
+ return Types.toBlob(result);
}
/**
@@ -196,15 +197,15 @@ public class Blob extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<Blob> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfBlob(result);
+ return Types.toSetOfBlob(result);
}
/**
@@ -213,15 +214,15 @@ public class Blob extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -230,15 +231,15 @@ public class Blob extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -247,15 +248,15 @@ public class Blob extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -264,15 +265,15 @@ public class Blob extends XenAPIObject {
* @return value of the field
*/
public Long getSize(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_size";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -281,15 +282,15 @@ public class Blob extends XenAPIObject {
* @return value of the field
*/
public Boolean getPublic(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_public";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -298,15 +299,15 @@ public class Blob extends XenAPIObject {
* @return value of the field
*/
public Date getLastUpdated(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_last_updated";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -315,15 +316,15 @@ public class Blob extends XenAPIObject {
* @return value of the field
*/
public String getMimeType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_mime_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -332,9 +333,9 @@ public class Blob extends XenAPIObject {
* @param label New value to set
*/
public void setNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(label)};
@@ -348,9 +349,9 @@ public class Blob extends XenAPIObject {
* @param description New value to set
*/
public void setNameDescription(Connection c, String description) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(description)};
@@ -364,9 +365,9 @@ public class Blob extends XenAPIObject {
* @param _public New value to set
*/
public void setPublic(Connection c, Boolean _public) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.set_public";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(_public)};
@@ -382,25 +383,25 @@ public class Blob extends XenAPIObject {
* @return The reference to the created blob
*/
public static Blob create(Connection c, String mimeType, Boolean _public) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.create";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(mimeType), Marshalling.toXMLRPC(_public)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBlob(result);
+ return Types.toBlob(result);
}
/**
- *
+ *
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -414,15 +415,15 @@ public class Blob extends XenAPIObject {
* @return references to all objects
*/
public static Set<Blob> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfBlob(result);
+ return Types.toSetOfBlob(result);
}
/**
@@ -431,15 +432,15 @@ public class Blob extends XenAPIObject {
* @return records of all objects
*/
public static Map<Blob, Blob.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "blob.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfBlobBlobRecord(result);
+ return Types.toMapOfBlobBlobRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Bond.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Bond.java b/deps/XenServerJava/src/com/xensource/xenapi/Bond.java
index 935fd98..5a54ad2 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Bond.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Bond.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -45,7 +46,7 @@ import java.util.Set;
import org.apache.xmlrpc.XmlRpcException;
/**
- *
+ *
*
* @author Citrix Systems, Inc.
*/
@@ -60,14 +61,14 @@ public class Bond extends XenAPIObject {
* For internal use only.
*/
Bond(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Bond extends XenAPIObject {
{
if (obj != null && obj instanceof Bond)
{
- Bond other = (Bond)obj;
+ Bond other = (Bond) obj;
return other.ref.equals(this.ref);
} else
{
@@ -113,8 +114,8 @@ public class Bond extends XenAPIObject {
/**
* Convert a Bond.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("master", this.master == null ? new PIF("OpaqueRef:NULL") : this.master);
map.put("slaves", this.slaves == null ? new LinkedHashSet<PIF>() : this.slaves);
@@ -166,15 +167,15 @@ public class Bond extends XenAPIObject {
* @return all fields from the object
*/
public Bond.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBondRecord(result);
+ return Types.toBondRecord(result);
}
/**
@@ -184,15 +185,15 @@ public class Bond extends XenAPIObject {
* @return reference to the object
*/
public static Bond getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBond(result);
+ return Types.toBond(result);
}
/**
@@ -201,15 +202,15 @@ public class Bond extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -218,15 +219,15 @@ public class Bond extends XenAPIObject {
* @return value of the field
*/
public PIF getMaster(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_master";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
@@ -235,15 +236,15 @@ public class Bond extends XenAPIObject {
* @return value of the field
*/
public Set<PIF> getSlaves(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_slaves";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPIF(result);
+ return Types.toSetOfPIF(result);
}
/**
@@ -252,15 +253,15 @@ public class Bond extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -269,15 +270,15 @@ public class Bond extends XenAPIObject {
* @return value of the field
*/
public PIF getPrimarySlave(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_primary_slave";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
@@ -286,15 +287,15 @@ public class Bond extends XenAPIObject {
* @return value of the field
*/
public Types.BondMode getMode(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBondMode(result);
+ return Types.toBondMode(result);
}
/**
@@ -303,15 +304,15 @@ public class Bond extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getProperties(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_properties";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -320,15 +321,15 @@ public class Bond extends XenAPIObject {
* @return value of the field
*/
public Long getLinksUp(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_links_up";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -337,9 +338,9 @@ public class Bond extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -354,9 +355,9 @@ public class Bond extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -370,9 +371,9 @@ public class Bond extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -391,13 +392,12 @@ public class Bond extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, Network network, Set<PIF> members, String MAC, Types.BondMode mode, Map<String, String> properties) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.Bond.create";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(members), Marshalling.toXMLRPC(MAC),
- Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(properties)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(members), Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(properties)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -414,16 +414,15 @@ public class Bond extends XenAPIObject {
* @return The reference of the created Bond object
*/
public static Bond create(Connection c, Network network, Set<PIF> members, String MAC, Types.BondMode mode, Map<String, String> properties) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.create";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(members), Marshalling.toXMLRPC(MAC),
- Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(properties)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(members), Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(properties)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBond(result);
+ return Types.toBond(result);
}
/**
@@ -432,9 +431,9 @@ public class Bond extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.Bond.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -448,9 +447,9 @@ public class Bond extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -465,9 +464,9 @@ public class Bond extends XenAPIObject {
* @return Task
*/
public Task setModeAsync(Connection c, Types.BondMode value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.Bond.set_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -482,9 +481,9 @@ public class Bond extends XenAPIObject {
* @param value The new bond mode
*/
public void setMode(Connection c, Types.BondMode value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.set_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -500,9 +499,9 @@ public class Bond extends XenAPIObject {
* @return Task
*/
public Task setPropertyAsync(Connection c, String name, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.Bond.set_property";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(value)};
@@ -518,9 +517,9 @@ public class Bond extends XenAPIObject {
* @param value The property value
*/
public void setProperty(Connection c, String name, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.set_property";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(value)};
@@ -534,15 +533,15 @@ public class Bond extends XenAPIObject {
* @return references to all objects
*/
public static Set<Bond> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfBond(result);
+ return Types.toSetOfBond(result);
}
/**
@@ -551,15 +550,15 @@ public class Bond extends XenAPIObject {
* @return records of all objects
*/
public static Map<Bond, Bond.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Bond.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfBondBondRecord(result);
+ return Types.toMapOfBondBondRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Connection.java b/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
old mode 100644
new mode 100755
index a652450..63469df
--- a/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
@@ -1,18 +1,19 @@
-/* Copyright (c) Citrix Systems, Inc.
+/*
+ * Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -38,7 +39,6 @@ import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfig;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
import org.apache.xmlrpc.client.XmlRpcHttpClientConfig;
-import org.apache.xmlrpc.client.XmlRpcSun15HttpTransportFactory;
import com.xensource.xenapi.Types.BadServerResponse;
import com.xensource.xenapi.Types.SessionAuthenticationFailed;
@@ -54,20 +54,10 @@ public class Connection
/**
* The version of the bindings that this class belongs to.
*/
- public static final String BINDINGS_VERSION = "6.1.0-1";
-
- /**
- * true if the connection is to the Rio edition of XenServer. Certain function calls are not allowed.
- *
- * @deprecated Use getAPIVersion() instead.
- */
- @Deprecated
- public Boolean rioConnection = false;
-
+ public static final String BINDINGS_VERSION = "6.2.0-1";
+
private APIVersion apiVersion;
- protected int _wait = 600;
-
/**
* Updated when Session.login_with_password() is called.
*/
@@ -91,47 +81,37 @@ public class Connection
/**
* Creates a connection to a particular server using a given username and password. This object can then be passed
* in to any other API calls.
- *
+ *
* This constructor calls Session.loginWithPassword, passing itself as the first parameter.
- *
+ *
* When this constructor is used, a call to dispose() (also called in the Connection's finalizer) will attempt a
* Session.logout on this connection.
- *
+ *
* @deprecated Use a constructor that takes a URL as the first parameter instead.
*/
@Deprecated
public Connection(String client, String username, String password) throws java.net.MalformedURLException,
- XmlRpcException, BadServerResponse, SessionAuthenticationFailed, XenAPIException
+ XmlRpcException, BadServerResponse, SessionAuthenticationFailed, XenAPIException
{
deprecatedConstructorUsed = true;
- // To login normally we call login_with_password(username, password, "1.X"). On rio this call fails and we
- // should use login_with_password(username,password) instead, and note that we are talking to a rio host so that we
- // can refuse to make certain miami-specific calls
final String ApiVersion = APIVersion.latest().toString();
this.client = getClientFromURL(new URL(client));
try
{
- //first try to login the modern way
this.sessionReference = loginWithPassword(this.client, username, password, ApiVersion);
} catch (BadServerResponse e)
{
- //oops, something went wrong
String[] errDesc = e.errorDescription;
- //was the problem that the host was running rio? If so it will have complained that it got three parameters
- //instead of two. Let us carefully verify the details of this complaint
+
if (0 == errDesc[0].compareTo("MESSAGE_PARAMETER_COUNT_MISMATCH")
- && 0 == errDesc[1].compareTo("session.login_with_password")
- && 0 == errDesc[2].compareTo("2")
- && 0 == errDesc[3].compareTo("3"))
+ && 0 == errDesc[1].compareTo("session.login_with_password")
+ && 0 == errDesc[2].compareTo("2")
+ && 0 == errDesc[3].compareTo("3"))
{
- //and if so, we can have another go, using the older login method, and see how that goes.
this.sessionReference = loginWithPassword(this.client, username, password);
- //success!. Note that we are talking to an old host on this connection
- this.rioConnection = true;
} else
{
- //Hmm... Can't solve this here. Let upstairs know about the problem.
throw e;
}
}
@@ -139,11 +119,13 @@ public class Connection
try
{
setAPIVersion(new Session(sessionReference));
- } catch (XenAPIException exn)
+ }
+ catch (XenAPIException exn)
{
dispose();
throw exn;
- } catch (XmlRpcException exn)
+ }
+ catch (XmlRpcException exn)
{
dispose();
throw exn;
@@ -153,24 +135,24 @@ public class Connection
/**
* Creates a connection to a particular server using a given username and password. This object can then be passed
* in to any other API calls.
- *
+ *
* Note this constructor does NOT call Session.loginWithPassword; the programmer is responsible for calling it,
* passing the Connection as a parameter. No attempt to connect to the server is made until login is called.
- *
+ *
* When this constructor is used, a call to dispose() will do nothing. The programmer is responsible for manually
* logging out the Session.
*/
- public Connection(URL url, int wait)
+ public Connection(URL url)
{
deprecatedConstructorUsed = false;
- _wait = wait;
+
this.client = getClientFromURL(url);
}
/**
* Creates a connection to a particular server using a given username and password. This object can then be passed
* in to any other API calls.
- *
+ *
* The additional sessionReference parameter must be a reference to a logged-in Session. Any method calls on this
* Connection will use it. This constructor does not call Session.loginWithPassword, and dispose() on the resulting
* Connection object does not call Session.logout. The programmer is responsible for ensuring the Session is logged
@@ -206,11 +188,12 @@ public class Connection
if (sessionReference != null)
{
String method_call = "session.logout";
- Object[] method_params = {Marshalling.toXMLRPC(this.sessionReference)};
+ Object[] method_params = { Marshalling.toXMLRPC(this.sessionReference) };
client.execute(method_call, method_params);
sessionReference = null;
}
- } catch (XmlRpcException exn)
+ }
+ catch (XmlRpcException exn)
{
}
}
@@ -220,17 +203,17 @@ public class Connection
*/
@Deprecated
private static String loginWithPassword(XmlRpcClient client, String username, String password)
- throws BadServerResponse, XmlRpcException, SessionAuthenticationFailed
+ throws BadServerResponse, XmlRpcException, SessionAuthenticationFailed
{
String method_call = "session.login_with_password";
- Object[] method_params = {Marshalling.toXMLRPC(username), Marshalling.toXMLRPC(password)};
- Map response = (Map)client.execute(method_call, method_params);
+ Object[] method_params = { Marshalling.toXMLRPC(username), Marshalling.toXMLRPC(password) };
+ Map response = (Map) client.execute(method_call, method_params);
if (response.get("Status").equals("Success"))
{
- return (String)response.get("Value");
+ return (String) response.get("Value");
} else if (response.get("Status").equals("Failure"))
{
- Object[] error = (Object[])response.get("ErrorDescription");
+ Object[] error = (Object[]) response.get("ErrorDescription");
if (error[0].equals("SESSION_AUTHENTICATION_FAILED"))
{
throw new SessionAuthenticationFailed();
@@ -244,18 +227,18 @@ public class Connection
*/
@Deprecated
private static String loginWithPassword(XmlRpcClient client, String username, String password, String ApiVersion)
- throws BadServerResponse, XmlRpcException, SessionAuthenticationFailed
+ throws BadServerResponse, XmlRpcException, SessionAuthenticationFailed
{
String method_call = "session.login_with_password";
- Object[] method_params = {Marshalling.toXMLRPC(username), Marshalling.toXMLRPC(password),
- Marshalling.toXMLRPC(ApiVersion)};
- Map response = (Map)client.execute(method_call, method_params);
+ Object[] method_params = { Marshalling.toXMLRPC(username), Marshalling.toXMLRPC(password),
+ Marshalling.toXMLRPC(ApiVersion) };
+ Map response = (Map) client.execute(method_call, method_params);
if (response.get("Status").equals("Success"))
{
- return (String)response.get("Value");
+ return (String) response.get("Value");
} else if (response.get("Status").equals("Failure"))
{
- Object[] error = (Object[])response.get("ErrorDescription");
+ Object[] error = (Object[]) response.get("ErrorDescription");
if (error[0].equals("SESSION_AUTHENTICATION_FAILED"))
{
throw new SessionAuthenticationFailed();
@@ -268,22 +251,19 @@ public class Connection
public XmlRpcClientConfigImpl getConfig()
{
- return config;
+ return config;
}
-
private XmlRpcClient getClientFromURL(URL url)
{
config.setTimeZone(TimeZone.getTimeZone("UTC"));
config.setServerURL(url);
- config.setReplyTimeout(_wait * 1000);
- config.setConnectionTimeout(5000);
XmlRpcClient client = new XmlRpcClient();
client.setConfig(config);
return client;
}
/*
- * Because the binding calls are constructing their own parameter lists, they need to be able to get to
+ * Because the binding calls are constructing their own parameter lists, they need to be able to get to
* the session reference directly. This is all rather ugly and needs redone
* Changed to public to allow easier integration with HTTP-level streaming interface,
* see CA-15447
@@ -296,9 +276,9 @@ public class Connection
/**
* The (auto-generated parts of) the bindings dispatch XMLRPC calls on this Connection's client through this method.
*/
- protected Map dispatch(String method_call, Object[] method_params) throws XmlRpcException, XenAPIException
+ Map dispatch(String method_call, Object[] method_params) throws XmlRpcException, XenAPIException
{
- Map response = (Map)client.execute(method_call, method_params);
+ Map response = (Map) client.execute(method_call, method_params);
if (!deprecatedConstructorUsed)
{
@@ -314,7 +294,7 @@ public class Connection
setAPIVersion(session);
}
else if (method_call.equals("session.slave_local_login_with_password") &&
- response.get("Status").equals("Success"))
+ response.get("Status").equals("Success"))
{
// Store the Session reference and assume the latest API version.
sessionReference = Types.toSession(response.get("Value")).ref;
@@ -329,7 +309,7 @@ public class Connection
// this session from the master instead.
if (response.get("Status").equals("Failure"))
{
- Object[] error = (Object[])response.get("ErrorDescription");
+ Object[] error = (Object[]) response.get("ErrorDescription");
if (error.length == 2 && error[0].equals("HOST_IS_SLAVE"))
{
try
@@ -338,18 +318,20 @@ public class Connection
((XmlRpcHttpClientConfig)client.getClientConfig()).getServerURL();
Connection tmp_conn =
new Connection(new URL(client_url.getProtocol(),
- (String)error[1],
- client_url.getPort(),
- client_url.getFile()), _wait);
+ (String)error[1],
+ client_url.getPort(),
+ client_url.getFile()));
tmp_conn.sessionReference = sessionReference;
try
{
Session.logout(tmp_conn);
- } finally
+ }
+ finally
{
tmp_conn.dispose();
}
- } catch (Exception exn2)
+ }
+ catch (Exception exn2)
{
// Ignore -- we're going to throw HostIsSlave anyway.
}
@@ -364,6 +346,7 @@ public class Connection
return Types.checkResponse(response);
}
+
private void setAPIVersion(Session session) throws XenAPIException, XmlRpcException
{
try
@@ -371,9 +354,10 @@ public class Connection
long major = session.getThisHost(this).getAPIVersionMajor(this);
long minor = session.getThisHost(this).getAPIVersionMinor(this);
apiVersion = APIVersion.fromMajorMinor(major, minor);
- } catch (BadServerResponse exn)
+ }
+ catch (BadServerResponse exn)
{
- apiVersion = APIVersion.API_1_1;
+ apiVersion = APIVersion.UNKNOWN;
}
}
}
[05/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VLAN.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VLAN.java b/deps/XenServerJava/src/com/xensource/xenapi/VLAN.java
index 9bea039..f0abe29 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VLAN.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VLAN.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VLAN extends XenAPIObject {
* For internal use only.
*/
VLAN(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VLAN extends XenAPIObject {
{
if (obj != null && obj instanceof VLAN)
{
- VLAN other = (VLAN)obj;
+ VLAN other = (VLAN) obj;
return other.ref.equals(this.ref);
} else
{
@@ -110,8 +111,8 @@ public class VLAN extends XenAPIObject {
/**
* Convert a VLAN.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("tagged_PIF", this.taggedPIF == null ? new PIF("OpaqueRef:NULL") : this.taggedPIF);
map.put("untagged_PIF", this.untaggedPIF == null ? new PIF("OpaqueRef:NULL") : this.untaggedPIF);
@@ -148,15 +149,15 @@ public class VLAN extends XenAPIObject {
* @return all fields from the object
*/
public VLAN.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVLANRecord(result);
+ return Types.toVLANRecord(result);
}
/**
@@ -166,15 +167,15 @@ public class VLAN extends XenAPIObject {
* @return reference to the object
*/
public static VLAN getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVLAN(result);
+ return Types.toVLAN(result);
}
/**
@@ -183,15 +184,15 @@ public class VLAN extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -200,15 +201,15 @@ public class VLAN extends XenAPIObject {
* @return value of the field
*/
public PIF getTaggedPIF(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.get_tagged_PIF";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
@@ -217,15 +218,15 @@ public class VLAN extends XenAPIObject {
* @return value of the field
*/
public PIF getUntaggedPIF(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.get_untagged_PIF";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
@@ -234,15 +235,15 @@ public class VLAN extends XenAPIObject {
* @return value of the field
*/
public Long getTag(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.get_tag";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -251,15 +252,15 @@ public class VLAN extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -268,9 +269,9 @@ public class VLAN extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -285,9 +286,9 @@ public class VLAN extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -301,9 +302,9 @@ public class VLAN extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -320,9 +321,9 @@ public class VLAN extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, PIF taggedPIF, Long tag, Network network) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VLAN.create";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(taggedPIF), Marshalling.toXMLRPC(tag), Marshalling.toXMLRPC(network)};
@@ -340,15 +341,15 @@ public class VLAN extends XenAPIObject {
* @return The reference of the created VLAN object
*/
public static VLAN create(Connection c, PIF taggedPIF, Long tag, Network network) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.create";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(taggedPIF), Marshalling.toXMLRPC(tag), Marshalling.toXMLRPC(network)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVLAN(result);
+ return Types.toVLAN(result);
}
/**
@@ -357,9 +358,9 @@ public class VLAN extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VLAN.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -373,9 +374,9 @@ public class VLAN extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -389,15 +390,15 @@ public class VLAN extends XenAPIObject {
* @return references to all objects
*/
public static Set<VLAN> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVLAN(result);
+ return Types.toSetOfVLAN(result);
}
/**
@@ -406,15 +407,15 @@ public class VLAN extends XenAPIObject {
* @return records of all objects
*/
public static Map<VLAN, VLAN.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VLAN.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVLANVLANRecord(result);
+ return Types.toMapOfVLANVLANRecord(result);
}
}
\ No newline at end of file
[04/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VM.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VM.java b/deps/XenServerJava/src/com/xensource/xenapi/VM.java
index cfa5e6c..6ed76af 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VM.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VM.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VM extends XenAPIObject {
* For internal use only.
*/
VM(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VM extends XenAPIObject {
{
if (obj != null && obj instanceof VM)
{
- VM other = (VM)obj;
+ VM other = (VM) obj;
return other.ref.equals(this.ref);
} else
{
@@ -173,14 +174,15 @@ public class VM extends XenAPIObject {
print.printf("%1$20s: %2$s\n", "attachedPCIs", this.attachedPCIs);
print.printf("%1$20s: %2$s\n", "suspendSR", this.suspendSR);
print.printf("%1$20s: %2$s\n", "version", this.version);
+ print.printf("%1$20s: %2$s\n", "generationId", this.generationId);
return writer.toString();
}
/**
* Convert a VM.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("allowed_operations", this.allowedOperations == null ? new LinkedHashSet<Types.VmOperations>() : this.allowedOperations);
map.put("current_operations", this.currentOperations == null ? new HashMap<String, Types.VmOperations>() : this.currentOperations);
@@ -255,6 +257,7 @@ public class VM extends XenAPIObject {
map.put("attached_PCIs", this.attachedPCIs == null ? new LinkedHashSet<PCI>() : this.attachedPCIs);
map.put("suspend_SR", this.suspendSR == null ? new SR("OpaqueRef:NULL") : this.suspendSR);
map.put("version", this.version == null ? 0 : this.version);
+ map.put("generation_id", this.generationId == null ? "" : this.generationId);
return map;
}
@@ -554,6 +557,10 @@ public class VM extends XenAPIObject {
* The number of times this VM has been recovered
*/
public Long version;
+ /**
+ * Generation ID of the VM
+ */
+ public String generationId;
}
/**
@@ -562,15 +569,15 @@ public class VM extends XenAPIObject {
* @return all fields from the object
*/
public VM.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMRecord(result);
+ return Types.toVMRecord(result);
}
/**
@@ -580,15 +587,15 @@ public class VM extends XenAPIObject {
* @return reference to the object
*/
public static VM getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -598,9 +605,9 @@ public class VM extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, VM.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VM.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -617,16 +624,16 @@ public class VM extends XenAPIObject {
* @return reference to the newly created object
*/
public static VM create(Connection c, VM.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -635,9 +642,9 @@ public class VM extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VM.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -651,9 +658,9 @@ public class VM extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -668,15 +675,15 @@ public class VM extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<VM> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVM(result);
+ return Types.toSetOfVM(result);
}
/**
@@ -685,15 +692,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -702,15 +709,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<Types.VmOperations> getAllowedOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_allowed_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVmOperations(result);
+ return Types.toSetOfVmOperations(result);
}
/**
@@ -719,15 +726,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<String, Types.VmOperations> getCurrentOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_current_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringVmOperations(result);
+ return Types.toMapOfStringVmOperations(result);
}
/**
@@ -736,15 +743,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Types.VmPowerState getPowerState(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_power_state";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVmPowerState(result);
+ return Types.toVmPowerState(result);
}
/**
@@ -753,15 +760,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -770,15 +777,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -787,15 +794,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getUserVersion(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_user_version";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -804,15 +811,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Boolean getIsATemplate(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_is_a_template";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -821,15 +828,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public VDI getSuspendVDI(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_suspend_VDI";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -838,15 +845,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Host getResidentOn(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_resident_on";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -855,15 +862,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Host getAffinity(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_affinity";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -872,15 +879,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getMemoryOverhead(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_memory_overhead";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -889,17 +896,16 @@ public class VM extends XenAPIObject {
*
* @return value of the field
*/
- @Deprecated
- public Long getMemoryTarget(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public Long getMemoryTarget(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_memory_target";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -908,15 +914,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getMemoryStaticMax(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_memory_static_max";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -925,15 +931,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getMemoryDynamicMax(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_memory_dynamic_max";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -942,15 +948,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getMemoryDynamicMin(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_memory_dynamic_min";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -959,15 +965,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getMemoryStaticMin(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_memory_static_min";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -976,15 +982,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getVCPUsParams(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_VCPUs_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -993,15 +999,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getVCPUsMax(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_VCPUs_max";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -1010,15 +1016,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getVCPUsAtStartup(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_VCPUs_at_startup";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -1027,15 +1033,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Types.OnNormalExit getActionsAfterShutdown(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_actions_after_shutdown";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toOnNormalExit(result);
+ return Types.toOnNormalExit(result);
}
/**
@@ -1044,15 +1050,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Types.OnNormalExit getActionsAfterReboot(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_actions_after_reboot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toOnNormalExit(result);
+ return Types.toOnNormalExit(result);
}
/**
@@ -1061,15 +1067,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Types.OnCrashBehaviour getActionsAfterCrash(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_actions_after_crash";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toOnCrashBehaviour(result);
+ return Types.toOnCrashBehaviour(result);
}
/**
@@ -1078,15 +1084,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<Console> getConsoles(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_consoles";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfConsole(result);
+ return Types.toSetOfConsole(result);
}
/**
@@ -1095,15 +1101,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<VIF> getVIFs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_VIFs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVIF(result);
+ return Types.toSetOfVIF(result);
}
/**
@@ -1112,15 +1118,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<VBD> getVBDs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_VBDs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVBD(result);
+ return Types.toSetOfVBD(result);
}
/**
@@ -1129,15 +1135,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<Crashdump> getCrashDumps(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_crash_dumps";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfCrashdump(result);
+ return Types.toSetOfCrashdump(result);
}
/**
@@ -1146,15 +1152,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<VTPM> getVTPMs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_VTPMs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVTPM(result);
+ return Types.toSetOfVTPM(result);
}
/**
@@ -1163,15 +1169,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getPVBootloader(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_PV_bootloader";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1180,15 +1186,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getPVKernel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_PV_kernel";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1197,15 +1203,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getPVRamdisk(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_PV_ramdisk";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1214,15 +1220,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getPVArgs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_PV_args";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1231,15 +1237,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getPVBootloaderArgs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_PV_bootloader_args";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1248,15 +1254,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getPVLegacyArgs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_PV_legacy_args";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1265,15 +1271,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getHVMBootPolicy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_HVM_boot_policy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1282,15 +1288,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getHVMBootParams(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_HVM_boot_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1299,15 +1305,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Double getHVMShadowMultiplier(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_HVM_shadow_multiplier";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDouble(result);
+ return Types.toDouble(result);
}
/**
@@ -1316,15 +1322,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getPlatform(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_platform";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1333,17 +1339,16 @@ public class VM extends XenAPIObject {
*
* @return value of the field
*/
- @Deprecated
- public String getPCIBus(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public String getPCIBus(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_PCI_bus";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1352,15 +1357,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1369,15 +1374,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getDomid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_domid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -1386,15 +1391,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getDomarch(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_domarch";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1403,15 +1408,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getLastBootCPUFlags(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_last_boot_CPU_flags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1420,15 +1425,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Boolean getIsControlDomain(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_is_control_domain";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -1437,15 +1442,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public VMMetrics getMetrics(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_metrics";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMMetrics(result);
+ return Types.toVMMetrics(result);
}
/**
@@ -1454,15 +1459,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public VMGuestMetrics getGuestMetrics(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_guest_metrics";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMGuestMetrics(result);
+ return Types.toVMGuestMetrics(result);
}
/**
@@ -1471,15 +1476,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getLastBootedRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_last_booted_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1488,15 +1493,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getRecommendations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_recommendations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1505,15 +1510,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getXenstoreData(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_xenstore_data";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1522,17 +1527,16 @@ public class VM extends XenAPIObject {
*
* @return value of the field
*/
- @Deprecated
- public Boolean getHaAlwaysRun(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public Boolean getHaAlwaysRun(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_ha_always_run";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -1541,15 +1545,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getHaRestartPriority(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_ha_restart_priority";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1558,15 +1562,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Boolean getIsASnapshot(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_is_a_snapshot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -1575,15 +1579,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public VM getSnapshotOf(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_snapshot_of";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -1592,15 +1596,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<VM> getSnapshots(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_snapshots";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVM(result);
+ return Types.toSetOfVM(result);
}
/**
@@ -1609,15 +1613,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Date getSnapshotTime(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_snapshot_time";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -1626,15 +1630,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getTransportableSnapshotId(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_transportable_snapshot_id";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1643,15 +1647,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<String, Blob> getBlobs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_blobs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringBlob(result);
+ return Types.toMapOfStringBlob(result);
}
/**
@@ -1660,15 +1664,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<String> getTags(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -1677,15 +1681,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<Types.VmOperations, String> getBlockedOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_blocked_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVmOperationsString(result);
+ return Types.toMapOfVmOperationsString(result);
}
/**
@@ -1694,15 +1698,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getSnapshotInfo(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_snapshot_info";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1711,15 +1715,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public String getSnapshotMetadata(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_snapshot_metadata";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1728,15 +1732,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public VM getParent(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_parent";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -1745,15 +1749,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<VM> getChildren(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_children";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVM(result);
+ return Types.toSetOfVM(result);
}
/**
@@ -1762,49 +1766,51 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getBiosStrings(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_bios_strings";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
* Get the protection_policy field of the given VM.
+ * @deprecated
*
* @return value of the field
*/
- public VMPP getProtectionPolicy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public VMPP getProtectionPolicy(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_protection_policy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMPP(result);
+ return Types.toVMPP(result);
}
/**
* Get the is_snapshot_from_vmpp field of the given VM.
+ * @deprecated
*
* @return value of the field
*/
- public Boolean getIsSnapshotFromVmpp(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public Boolean getIsSnapshotFromVmpp(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_is_snapshot_from_vmpp";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -1813,15 +1819,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public VMAppliance getAppliance(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_appliance";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMAppliance(result);
+ return Types.toVMAppliance(result);
}
/**
@@ -1830,15 +1836,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getStartDelay(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_start_delay";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -1847,15 +1853,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getShutdownDelay(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_shutdown_delay";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -1864,15 +1870,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getOrder(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_order";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -1881,15 +1887,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<VGPU> getVGPUs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_VGPUs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVGPU(result);
+ return Types.toSetOfVGPU(result);
}
/**
@@ -1898,15 +1904,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Set<PCI> getAttachedPCIs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_attached_PCIs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPCI(result);
+ return Types.toSetOfPCI(result);
}
/**
@@ -1915,15 +1921,15 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public SR getSuspendSR(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_suspend_SR";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -1932,15 +1938,32 @@ public class VM extends XenAPIObject {
* @return value of the field
*/
public Long getVersion(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.get_version";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
+ }
+
+ /**
+ * Get the generation_id field of the given VM.
+ *
+ * @return value of the field
+ */
+ public String getGenerationId(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VM.get_generation_id";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toString(result);
}
/**
@@ -1949,9 +1972,9 @@ public class VM extends XenAPIObject {
* @param label New value to set
*/
public void setNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(label)};
@@ -1965,9 +1988,9 @@ public class VM extends XenAPIObject {
* @param description New value to set
*/
public void setNameDescription(Connection c, String description) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(description)};
@@ -1981,9 +2004,9 @@ public class VM extends XenAPIObject {
* @param userVersion New value to set
*/
public void setUserVersion(Connection c, Long userVersion) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_user_version";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(userVersion)};
@@ -1997,9 +2020,9 @@ public class VM extends XenAPIObject {
* @param isATemplate New value to set
*/
public void setIsATemplate(Connection c, Boolean isATemplate) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_is_a_template";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(isATemplate)};
@@ -2013,9 +2036,9 @@ public class VM extends XenAPIObject {
* @param affinity New value to set
*/
public void setAffinity(Connection c, Host affinity) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_affinity";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(affinity)};
@@ -2029,9 +2052,9 @@ public class VM extends XenAPIObject {
* @param params New value to set
*/
public void setVCPUsParams(Connection c, Map<String, String> params) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_VCPUs_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(params)};
@@ -2046,9 +2069,9 @@ public class VM extends XenAPIObject {
* @param value Value to add
*/
public void addToVCPUsParams(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.add_to_VCPUs_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -2062,9 +2085,9 @@ public class VM extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromVCPUsParams(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.remove_from_VCPUs_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -2078,9 +2101,9 @@ public class VM extends XenAPIObject {
* @param afterShutdown New value to set
*/
public void setActionsAfterShutdown(Connection c, Types.OnNormalExit afterShutdown) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_actions_after_shutdown";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(afterShutdown)};
@@ -2094,9 +2117,9 @@ public class VM extends XenAPIObject {
* @param afterReboot New value to set
*/
public void setActionsAfterReboot(Connection c, Types.OnNormalExit afterReboot) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_actions_after_reboot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(afterReboot)};
@@ -2110,9 +2133,9 @@ public class VM extends XenAPIObject {
* @param afterCrash New value to set
*/
public void setActionsAfterCrash(Connection c, Types.OnCrashBehaviour afterCrash) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_actions_after_crash";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(afterCrash)};
@@ -2126,9 +2149,9 @@ public class VM extends XenAPIObject {
* @param bootloader New value to set
*/
public void setPVBootloader(Connection c, String bootloader) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_PV_bootloader";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(bootloader)};
@@ -2142,9 +2165,9 @@ public class VM extends XenAPIObject {
* @param kernel New value to set
*/
public void setPVKernel(Connection c, String kernel) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_PV_kernel";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(kernel)};
@@ -2158,9 +2181,9 @@ public class VM extends XenAPIObject {
* @param ramdisk New value to set
*/
public void setPVRamdisk(Connection c, String ramdisk) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_PV_ramdisk";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(ramdisk)};
@@ -2174,9 +2197,9 @@ public class VM extends XenAPIObject {
* @param args New value to set
*/
public void setPVArgs(Connection c, String args) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_PV_args";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(args)};
@@ -2190,9 +2213,9 @@ public class VM extends XenAPIObject {
* @param bootloaderArgs New value to set
*/
public void setPVBootloaderArgs(Connection c, String bootloaderArgs) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_PV_bootloader_args";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(bootloaderArgs)};
@@ -2206,9 +2229,9 @@ public class VM extends XenAPIObject {
* @param legacyArgs New value to set
*/
public void setPVLegacyArgs(Connection c, String legacyArgs) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_PV_legacy_args";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(legacyArgs)};
@@ -2222,9 +2245,9 @@ public class VM extends XenAPIObject {
* @param bootPolicy New value to set
*/
public void setHVMBootPolicy(Connection c, String bootPolicy) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_HVM_boot_policy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(bootPolicy)};
@@ -2238,9 +2261,9 @@ public class VM extends XenAPIObject {
* @param bootParams New value to set
*/
public void setHVMBootParams(Connection c, Map<String, String> bootParams) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_HVM_boot_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(bootParams)};
@@ -2255,9 +2278,9 @@ public class VM extends XenAPIObject {
* @param value Value to add
*/
public void addToHVMBootParams(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.add_to_HVM_boot_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -2271,9 +2294,9 @@ public class VM extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromHVMBootParams(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.remove_from_HVM_boot_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -2287,9 +2310,9 @@ public class VM extends XenAPIObject {
* @param platform New value to set
*/
public void setPlatform(Connection c, Map<String, String> platform) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_platform";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(platform)};
@@ -2304,9 +2327,9 @@ public class VM extends XenAPIObject {
* @param value Value to add
*/
public void addToPlatform(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.add_to_platform";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -2320,9 +2343,9 @@ public class VM extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromPlatform(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.remove_from_platform";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -2336,11 +2359,10 @@ public class VM extends XenAPIObject {
*
* @param PCIBus New value to set
*/
- @Deprecated
- public void setPCIBus(Connection c, String PCIBus) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public void setPCIBus(Connection c, String PCIBus) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_PCI_bus";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(PCIBus)};
@@ -2354,9 +2376,9 @@ public class VM extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -2371,9 +2393,9 @@ public class VM extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -2387,9 +2409,9 @@ public class VM extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -2403,9 +2425,9 @@ public class VM extends XenAPIObject {
* @param recommendations New value to set
*/
public void setRecommendations(Connection c, String recommendations) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_recommendations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(recommendations)};
@@ -2419,9 +2441,9 @@ public class VM extends XenAPIObject {
* @param xenstoreData New value to set
*/
public void setXenstoreData(Connection c, Map<String, String> xenstoreData) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_xenstore_data";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(xenstoreData)};
@@ -2436,9 +2458,9 @@ public class VM extends XenAPIObject {
* @param value Value to add
*/
public void addToXenstoreData(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.add_to_xenstore_data";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -2452,9 +2474,9 @@ public class VM extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromXenstoreData(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.remove_from_xenstore_data";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -2468,9 +2490,9 @@ public class VM extends XenAPIObject {
* @param tags New value to set
*/
public void setTags(Connection c, Set<String> tags) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(tags)};
@@ -2484,9 +2506,9 @@ public class VM extends XenAPIObject {
* @param value New value to add
*/
public void addTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.add_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -2500,9 +2522,9 @@ public class VM extends XenAPIObject {
* @param value Value to remove
*/
public void removeTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.remove_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -2516,9 +2538,9 @@ public class VM extends XenAPIObject {
* @param blockedOperations New value to set
*/
public void setBlockedOperations(Connection c, Map<Types.VmOperations, String> blockedOperations) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_blocked_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(blockedOperations)};
@@ -2533,9 +2555,9 @@ public class VM extends XenAPIObject {
* @param value Value to add
*/
public void addToBlockedOperations(Connection c, Types.VmOperations key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.add_to_blocked_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -2549,9 +2571,9 @@ public class VM extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromBlockedOperations(Connection c, Types.VmOperations key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.remove_from_blocked_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -2565,9 +2587,9 @@ public class VM extends XenAPIObject {
* @param suspendSR New value to set
*/
public void setSuspendSR(Connection c, SR suspendSR) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VM.set_suspend_SR";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(suspendSR)};
@@ -2582,12 +2604,12 @@ public class VM extends XenAPIObject {
* @return Task
*/
public Task snapshotAsync(Connection c, String newName) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VmBadPowerState,
- Types.SrFull,
- Types.OperationNotAllowed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VmBadPowerState,
+ Types.SrFull,
+ Types.OperationNotAllowed {
String method_call = "Async.VM.snapshot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(newName)};
@@ -2603,18 +2625,18 @@ public class VM extends XenAPIObject {
* @return The reference of the newly created VM.
*/
public VM snapshot(Connection c, String newName) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VmBadPowerState,
- Types.SrFull,
- Types.OperationNotAllowed {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VmBadPowerState,
+ Types.SrFull,
+ Types.OperationNotAllowed {
String method_call = "VM.snapshot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(newName)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -2624,16 +2646,16 @@ public class VM extends XenAPIObject {
*
<TRUNCATED>
[42/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Prevent DHCPACK for DHCPINFORM in the DHCP server
The orignal "dhcp-range=xxx,static" would only prohibit DHCPREQUEST from unknown
hosts, but not DHCPINFORM which can request routing information. This caused
trouble for some bridged networks outside CloudStack.
This patch would fix the issue, prevent dnsmasq from acking any unknown request.
Signed-off-by: Sheng Yang <sh...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/986813d9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/986813d9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/986813d9
Branch: refs/heads/acl-item-cidrs
Commit: 986813d9735d4930f7e0998aad7120e205ec50b1
Parents: b0c6d47
Author: Joris van Lieshout <jv...@schubergphilis.com>
Authored: Thu Feb 20 14:54:04 2014 +0100
Committer: Sheng Yang <sh...@citrix.com>
Committed: Tue Feb 25 14:55:24 2014 -0800
----------------------------------------------------------------------
systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/986813d9/systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl b/systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl
index 07c5902..447e748 100644
--- a/systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl
+++ b/systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl
@@ -277,7 +277,9 @@ dhcp-hostsfile=/etc/dhcphosts.txt
# or /etc/ethers. Equivalent to ISC "deny unknown-clients".
# This relies on the special "known" tag which is set when
# a host is matched.
-#dhcp-ignore=tag:!known
+#
+# When using bridged networks in ACS this prevents ack to DHCPINFORM etc. request
+dhcp-ignore=tag:!known
# Send extra options which are tagged as "red" to any machine whose
# DHCP vendorclass string includes the substring "Linux"
[44/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
CLOUDSTACK-6146. [VMware] [ESXi 5.5] Live storage migration of an already migrated volume fails
In vCenter 5.5, once a volume is migrated the VMDKs are renamed to match the name of the VM.
If a volume has been renamed upon migration update its volumePath to that of the new disk filename.
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0926bf57
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0926bf57
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0926bf57
Branch: refs/heads/acl-item-cidrs
Commit: 0926bf57f468322fd1523325a5b45aa6a094debc
Parents: b484b48
Author: Likitha Shetty <li...@citrix.com>
Authored: Mon Feb 24 10:12:58 2014 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Wed Feb 26 13:45:43 2014 +0530
----------------------------------------------------------------------
.../vmware/resource/VmwareResource.java | 15 +++++++++++++--
.../hypervisor/vmware/mo/VirtualMachineMO.java | 18 ++++++++++++------
2 files changed, 25 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0926bf57/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 60c5909..3b631ac 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3163,10 +3163,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
throw new Exception(msg);
}
- VmwareStorageLayoutHelper.getVmwareDatastorePathFromVmdkFileName(new DatastoreMO(srcHyperHost.getContext(), morDs), vmName, volumePath + ".vmdk");
+ DatastoreMO targetDsMo = new DatastoreMO(srcHyperHost.getContext(), morDs);
+ String fullVolumePath = VmwareStorageLayoutHelper.getVmwareDatastorePathFromVmdkFileName(targetDsMo, vmName, volumePath + ".vmdk");
+ int diskId = getVirtualDiskInfo(vmMo, volumePath + ".vmdk");
diskLocator = new VirtualMachineRelocateSpecDiskLocator();
diskLocator.setDatastore(morDs);
- diskLocator.setDiskId(getVirtualDiskInfo(vmMo, volumePath + ".vmdk"));
+ diskLocator.setDiskId(diskId);
diskLocators.add(diskLocator);
relocateSpec.getDisk().add(diskLocator);
@@ -3178,6 +3180,15 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
s_logger.debug("Successfully migrated volume " + volumePath + " to target datastore " + tgtDsName);
}
+ // Update and return volume path because that could have changed after migration
+ if (!targetDsMo.fileExists(fullVolumePath)) {
+ VirtualDisk[] disks = vmMo.getAllDiskDevice();
+ for (VirtualDisk disk : disks)
+ if (disk.getKey() == diskId) {
+ volumePath = vmMo.getVmdkFileBaseName(disk);
+ }
+ }
+
return new MigrateVolumeAnswer(cmd, true, null, volumePath);
} catch (Exception e) {
String msg = "Catch Exception " + e.getClass().getName() + " due to " + e.toString();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0926bf57/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 7fc8836..3e83bb6 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -1800,17 +1800,23 @@ public class VirtualMachineMO extends BaseMO {
VirtualDevice[] devices = getAllDiskDevice();
for(VirtualDevice device : devices) {
if(device instanceof VirtualDisk) {
- VirtualDeviceBackingInfo backingInfo = ((VirtualDisk)device).getBacking();
- if(backingInfo instanceof VirtualDiskFlatVer2BackingInfo) {
- VirtualDiskFlatVer2BackingInfo diskBackingInfo = (VirtualDiskFlatVer2BackingInfo)backingInfo;
- DatastoreFile dsBackingFile = new DatastoreFile(diskBackingInfo.getFileName());
- vmdkFileBaseNames.add(dsBackingFile.getFileBaseName());
- }
+ vmdkFileBaseNames.add(getVmdkFileBaseName((VirtualDisk)device));
}
}
return vmdkFileBaseNames;
}
+ public String getVmdkFileBaseName(VirtualDisk disk) throws Exception {
+ String vmdkFileBaseName = null;
+ VirtualDeviceBackingInfo backingInfo = disk.getBacking();
+ if(backingInfo instanceof VirtualDiskFlatVer2BackingInfo) {
+ VirtualDiskFlatVer2BackingInfo diskBackingInfo = (VirtualDiskFlatVer2BackingInfo)backingInfo;
+ DatastoreFile dsBackingFile = new DatastoreFile(diskBackingInfo.getFileName());
+ vmdkFileBaseName = dsBackingFile.getFileBaseName();
+ }
+ return vmdkFileBaseName;
+ }
+
// this method relies on un-offical VMware API
@Deprecated
public void moveAllVmDiskFiles(DatastoreMO destDsMo, String destDsDir, boolean followDiskChain) throws Exception {
[25/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Update the XenServer library to version 6.2.0-1 in the poms.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb23e3ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb23e3ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb23e3ac
Branch: refs/heads/acl-item-cidrs
Commit: bb23e3ac1f5af8d7cbfaab313bb254dc86be0f92
Parents: 7aa70fe
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Feb 25 12:29:00 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 25 12:30:46 2014 +0100
----------------------------------------------------------------------
deps/XenServerJava/Makefile | 44 ----------------------------------------
deps/XenServerJava/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 2 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb23e3ac/deps/XenServerJava/Makefile
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/Makefile b/deps/XenServerJava/Makefile
deleted file mode 100644
index c78144a..0000000
--- a/deps/XenServerJava/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Makefile to compile the Xen Java SDK bindings
-
-BINDINGJAVAFILES := $(wildcard com/xensource/xenapi/*.java)
-BINDINGCLASSFILES := $(BINDINGJAVAFILES:.java=.class)
-BINDINGJAR := xenserver-5.6.100-1.jar
-
-CLASSPATH := :../cloud-xmlrpc-client-3.1.3.jar:../cloud-xmlrpc-common-3.1.3.jar:../cloud-ws-commons-util-1.0.2.jar
-EXAMPLECLASSPATH := :$(BINDINGJAR)$(CLASSPATH)
-
-.PHONY: all
-all: $(BINDINGJAR) tests
- @ :
-
-# Target to compile the automated tests
-.PHONY: tests
-tests: $(patsubst %.java,%.class,$(wildcard *.java))
- @ :
-
-.PHONY: docs
-docs:
- javadoc -classpath ${CLASSPATH} -d doc -link http://java.sun.com/javase/6/docs/api com/xensource/xenapi/*.java
-
-%.class: %.java
- javac -cp ${CLASSPATH} $^
-
-$(BINDINGJAR): $(BINDINGCLASSFILES)
- jar -cvf $@ com/xensource/xenapi/*.class
-
-.PHONY: cleanclass
-cleanclass:
- rm -f com/xensource/xenapi/*.class
- rm -f *.class
-
-.PHONY: cleanjar
-cleanjar:
- rm -f $(BINDINGJAR)
-
-.PHONY: cleandocs
-cleandocs:
- rm -rf doc
-
-.PHONY: clean
-clean: cleanjar cleanclass cleandocs
- @ :
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb23e3ac/deps/XenServerJava/pom.xml
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml
index 84d9a97..c9a4e86 100644
--- a/deps/XenServerJava/pom.xml
+++ b/deps/XenServerJava/pom.xml
@@ -25,7 +25,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>xapi</artifactId>
- <version>5.6.100-1-SNAPSHOT</version>
+ <version>6.2.0-1-SNAPSHOT</version>
<name>Apache XenSource XAPI</name>
<description>XenSource XAPI Java Bindings</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb23e3ac/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1e9e8d8..c0b8219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<cs.ehcache.version>2.6.6</cs.ehcache.version>
<cs.gson.version>1.7.1</cs.gson.version>
<cs.guava.version>14.0-rc1</cs.guava.version>
- <cs.xapi.version>5.6.100-1-SNAPSHOT</cs.xapi.version>
+ <cs.xapi.version>6.2.0-1-SNAPSHOT</cs.xapi.version>
<cs.httpclient.version>3.1</cs.httpclient.version>
<cs.httpcore.version>4.2.1</cs.httpcore.version>
<cs.mysql.version>5.1.21</cs.mysql.version>
[40/50] [abbrv] - Updated APICommand annotation to add new flags that
indicate if API request or response carry sensitive info - Updated all API
classes with the new annotation flag values as per the API's sensitivity -
Updated server code to check respo
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
index cfbbd36..e9fbc6d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
@@ -38,7 +38,9 @@ import com.cloud.user.Account;
@APICommand(name = "createStorageNetworkIpRange",
description = "Creates a Storage network IP range.",
responseObject = StorageNetworkIpRangeResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CreateStorageNetworkIpRangeCmd.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
index 51b4924..2890c27 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.GuestVlan;
import com.cloud.user.Account;
-@APICommand(name = "dedicateGuestVlanRange", description = "Dedicates a guest vlan range to an account", responseObject = GuestVlanRangeResponse.class)
+@APICommand(name = "dedicateGuestVlanRange", description = "Dedicates a guest vlan range to an account", responseObject = GuestVlanRangeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DedicateGuestVlanRangeCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DedicateGuestVlanRangeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
index 96e4fa5..abd9c11 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteNetworkDevice", description = "Deletes network device.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteNetworkDevice", description = "Deletes network device.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkDeviceCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkDeviceCmd.class);
private static final String s_name = "deletenetworkdeviceresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
index 3aa7d66..62de3dd 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
-@APICommand(name = "deleteNetworkOffering", description = "Deletes a network offering.", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "deleteNetworkOffering", description = "Deletes a network offering.", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkOfferingCmd.class.getName());
private static final String s_name = "deletenetworkofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
index c4993c3..9df27d3 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "deleteNetworkServiceProvider", description = "Deletes a Network Service Provider.", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "deleteNetworkServiceProvider", description = "Deletes a Network Service Provider.", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkServiceProviderCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkServiceProviderCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
index 828683a..4d8c446 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "deletePhysicalNetwork", description = "Deletes a Physical Network.", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "deletePhysicalNetwork", description = "Deletes a Physical Network.", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeletePhysicalNetworkCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeletePhysicalNetworkCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
index 42c9619..c431727 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "deleteStorageNetworkIpRange", description = "Deletes a storage network IP Range.", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "deleteStorageNetworkIpRange", description = "Deletes a storage network IP Range.", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteStorageNetworkIpRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteStorageNetworkIpRangeCmd.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
index ca7c1f7..9b1935c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
@@ -36,7 +36,8 @@ import com.cloud.network.GuestVlan;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
-@APICommand(name = "listDedicatedGuestVlanRanges", description = "Lists dedicated guest vlan ranges", responseObject = GuestVlanRangeResponse.class)
+@APICommand(name = "listDedicatedGuestVlanRanges", description = "Lists dedicated guest vlan ranges", responseObject = GuestVlanRangeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListDedicatedGuestVlanRangesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDedicatedGuestVlanRangesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
index de175d0..405c265 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
@@ -42,7 +42,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.host.Host;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listNetworkDevice", description = "List network devices", responseObject = NetworkDeviceResponse.class)
+@APICommand(name = "listNetworkDevice", description = "List network devices", responseObject = NetworkDeviceResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNetworkDeviceCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkDeviceCmd.class);
private static final String s_name = "listnetworkdevice";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
index d30f7b8..8242df9 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
@@ -29,7 +29,9 @@ import com.cloud.network.Networks;
@APICommand(name = "listNetworkIsolationMethods",
description = "Lists supported methods of network isolation",
responseObject = IsolationMethodResponse.class,
- since = "4.2.0")
+ since = "4.2.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListNetworkIsolationMethodsCmd extends BaseListCmd {
private static final String s_name = "listnetworkisolationmethodsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
index 5a1235b..94b8597 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
@@ -36,7 +36,9 @@ import com.cloud.utils.Pair;
@APICommand(name = "listNetworkServiceProviders",
description = "Lists network serviceproviders for a given physical network.",
responseObject = ProviderResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListNetworkServiceProvidersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkServiceProvidersCmd.class.getName());
private static final String Name = "listnetworkserviceprovidersresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
index 3ac2faa..e495fd6 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
@@ -35,7 +35,8 @@ import com.cloud.network.PhysicalNetwork;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
-@APICommand(name = "listPhysicalNetworks", description = "Lists physical networks", responseObject = PhysicalNetworkResponse.class, since = "3.0.0")
+@APICommand(name = "listPhysicalNetworks", description = "Lists physical networks", responseObject = PhysicalNetworkResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListPhysicalNetworksCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListPhysicalNetworksCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
index 89cba47..b3f8b81 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
@@ -39,7 +39,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "listStorageNetworkIpRange", description = "List a storage network IP range.", responseObject = StorageNetworkIpRangeResponse.class, since = "3.0.0")
+@APICommand(name = "listStorageNetworkIpRange", description = "List a storage network IP range.", responseObject = StorageNetworkIpRangeResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListStorageNetworkIpRangeCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListStorageNetworkIpRangeCmd.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
index 342f9b0..612c733 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
@@ -36,7 +36,9 @@ import com.cloud.user.Account;
@APICommand(name = "listSupportedNetworkServices",
description = "Lists all network services provided by CloudStack or for the given Provider.",
responseObject = ServiceResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListSupportedNetworkServicesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListSupportedNetworkServicesCmd.class.getName());
private static final String Name = "listsupportednetworkservicesresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
index 43e1149..263d46a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "releaseDedicatedGuestVlanRange", description = "Releases a dedicated guest vlan range to the system", responseObject = SuccessResponse.class)
+@APICommand(name = "releaseDedicatedGuestVlanRange", description = "Releases a dedicated guest vlan range to the system", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReleaseDedicatedGuestVlanRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedGuestVlanRangeCmd.class.getName());
private static final String s_name = "releasededicatedguestvlanrangeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
index 957450f..f650b4f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.NetworkOfferingResponse;
import com.cloud.offering.NetworkOffering;
import com.cloud.user.Account;
-@APICommand(name = "updateNetworkOffering", description = "Updates a network offering.", responseObject = NetworkOfferingResponse.class)
+@APICommand(name = "updateNetworkOffering", description = "Updates a network offering.", responseObject = NetworkOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateNetworkOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkOfferingCmd.class.getName());
private static final String Name = "updatenetworkofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
index c530c53..bb4f64e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
@@ -36,7 +36,9 @@ import com.cloud.user.Account;
@APICommand(name = "updateNetworkServiceProvider",
description = "Updates a network serviceProvider of a physical network",
responseObject = ProviderResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class UpdateNetworkServiceProviderCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkServiceProviderCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
index f808424..8e29c39 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
@@ -31,7 +31,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.PhysicalNetwork;
import com.cloud.user.Account;
-@APICommand(name = "updatePhysicalNetwork", description = "Updates a physical network", responseObject = PhysicalNetworkResponse.class, since = "3.0.0")
+@APICommand(name = "updatePhysicalNetwork", description = "Updates a physical network", responseObject = PhysicalNetworkResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdatePhysicalNetworkCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
index 9fd084a..d82c28d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
@@ -37,7 +37,9 @@ import com.cloud.user.Account;
@APICommand(name = "updateStorageNetworkIpRange",
description = "Update a Storage network IP range, only allowed when no IPs in this range have been allocated.",
responseObject = StorageNetworkIpRangeResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateStorageNetworkIpRangeCmd.class);
private static final String s_name = "updatestoragenetworkiprangeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
index 1d959a0..84c2c25 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
@@ -31,7 +31,8 @@ import com.cloud.offering.DiskOffering;
import com.cloud.offering.ServiceOffering;
import com.cloud.user.Account;
-@APICommand(name = "createDiskOffering", description = "Creates a disk offering.", responseObject = DiskOfferingResponse.class)
+@APICommand(name = "createDiskOffering", description = "Creates a disk offering.", responseObject = DiskOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateDiskOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateDiskOfferingCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index 6f9693c..1d8cbff 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import com.cloud.offering.ServiceOffering;
import com.cloud.user.Account;
-@APICommand(name = "createServiceOffering", description = "Creates a service offering.", responseObject = ServiceOfferingResponse.class)
+@APICommand(name = "createServiceOffering", description = "Creates a service offering.", responseObject = ServiceOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateServiceOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateServiceOfferingCmd.class.getName());
private static final String Name = "createserviceofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
index 9845aa4..8987d50 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
-@APICommand(name = "deleteDiskOffering", description = "Updates a disk offering.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteDiskOffering", description = "Updates a disk offering.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteDiskOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteDiskOfferingCmd.class.getName());
private static final String s_name = "deletediskofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
index 0f81409..2a07fff 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
-@APICommand(name = "deleteServiceOffering", description = "Deletes a service offering.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteServiceOffering", description = "Deletes a service offering.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteServiceOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteServiceOfferingCmd.class.getName());
private static final String s_name = "deleteserviceofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
index 6d45fb5..6e1fde5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.DiskOfferingResponse;
import com.cloud.offering.DiskOffering;
import com.cloud.user.Account;
-@APICommand(name = "updateDiskOffering", description = "Updates a disk offering.", responseObject = DiskOfferingResponse.class)
+@APICommand(name = "updateDiskOffering", description = "Updates a disk offering.", responseObject = DiskOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateDiskOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateDiskOfferingCmd.class.getName());
private static final String s_name = "updatediskofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
index fbc8845..f4f4bdf 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import com.cloud.offering.ServiceOffering;
import com.cloud.user.Account;
-@APICommand(name = "updateServiceOffering", description = "Updates a service offering.", responseObject = ServiceOfferingResponse.class)
+@APICommand(name = "updateServiceOffering", description = "Updates a service offering.", responseObject = ServiceOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateServiceOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateServiceOfferingCmd.class.getName());
private static final String s_name = "updateserviceofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
index 835a3b9..d912b44 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.dc.Pod;
import com.cloud.user.Account;
-@APICommand(name = "createPod", description = "Creates a new Pod.", responseObject = PodResponse.class)
+@APICommand(name = "createPod", description = "Creates a new Pod.", responseObject = PodResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreatePodCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreatePodCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
index 584eed4..c2edacb 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
-@APICommand(name = "deletePod", description = "Deletes a Pod.", responseObject = SuccessResponse.class)
+@APICommand(name = "deletePod", description = "Deletes a Pod.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeletePodCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeletePodCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
index 75b5efd..3cc03f2 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.dc.Pod;
import com.cloud.utils.Pair;
-@APICommand(name = "listPods", description = "Lists all Pods.", responseObject = PodResponse.class)
+@APICommand(name = "listPods", description = "Lists all Pods.", responseObject = PodResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListPodsByCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListPodsByCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
index 7b8f6eb..c89694c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.PodResponse;
import com.cloud.dc.Pod;
import com.cloud.user.Account;
-@APICommand(name = "updatePod", description = "Updates a Pod.", responseObject = PodResponse.class)
+@APICommand(name = "updatePod", description = "Updates a Pod.", responseObject = PodResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdatePodCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdatePodCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
index 9e7c035..f6743ba 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.region.RegionService;
import com.cloud.user.Account;
-@APICommand(name = "addRegion", description = "Adds a Region", responseObject = RegionResponse.class)
+@APICommand(name = "addRegion", description = "Adds a Region", responseObject = RegionResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddRegionCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddRegionCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
index e900f47..955bb9c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
@@ -38,7 +38,9 @@ import com.cloud.user.Account;
@APICommand(name = "createPortableIpRange",
responseObject = PortableIpRangeResponse.class,
description = "adds a range of portable public IP's to a region",
- since = "4.2.0")
+ since = "4.2.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class CreatePortableIpRangeCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreatePortableIpRangeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
index 5408eda..413818b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/DeletePortableIpRangeCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "deletePortableIpRange", description = "deletes a range of portable public IP's associated with a region", responseObject = SuccessResponse.class)
+@APICommand(name = "deletePortableIpRange", description = "deletes a range of portable public IP's associated with a region", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeletePortableIpRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeletePortableIpRangeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
index 42a92e6..100572e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/ListPortableIpRangesCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.region.PortableIpRange;
import com.cloud.user.Account;
-@APICommand(name = "listPortableIpRanges", description = "list portable IP ranges", responseObject = PortableIpRangeResponse.class)
+@APICommand(name = "listPortableIpRanges", description = "list portable IP ranges", responseObject = PortableIpRangeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListPortableIpRangesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListPortableIpRangesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
index e912659..415456f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.region.RegionService;
import com.cloud.user.Account;
-@APICommand(name = "removeRegion", description = "Removes specified region", responseObject = SuccessResponse.class)
+@APICommand(name = "removeRegion", description = "Removes specified region", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RemoveRegionCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(RemoveRegionCmd.class.getName());
private static final String s_name = "removeregionresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java b/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
index 527e142..b08cbbb 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.region.RegionService;
import com.cloud.user.Account;
-@APICommand(name = "updateRegion", description = "Updates a region", responseObject = RegionResponse.class)
+@APICommand(name = "updateRegion", description = "Updates a region", responseObject = RegionResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateRegionCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateRegionCmd.class.getName());
private static final String s_name = "updateregionresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
index b1177b9..79b3520 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
-@APICommand(name = "archiveAlerts", description = "Archive one or more alerts.", responseObject = SuccessResponse.class)
+@APICommand(name = "archiveAlerts", description = "Archive one or more alerts.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ArchiveAlertsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ArchiveAlertsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
index edc3bcf..9acc71c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/CleanVMReservationsCmd.java
@@ -28,7 +28,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "cleanVMReservations", description = "Cleanups VM reservations in the database.", responseObject = SuccessResponse.class)
+@APICommand(name = "cleanVMReservations", description = "Cleanups VM reservations in the database.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CleanVMReservationsCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CleanVMReservationsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
index 8ba2525..246b257 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
-@APICommand(name = "deleteAlerts", description = "Delete one or more alerts.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteAlerts", description = "Delete one or more alerts.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteAlertsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteAlertsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
index 397b00a..8f21263 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
@@ -30,7 +30,8 @@ import org.apache.log4j.Logger;
import com.cloud.alert.Alert;
import com.cloud.utils.Pair;
-@APICommand(name = "listAlerts", description = "Lists all alerts.", responseObject = AlertResponse.class)
+@APICommand(name = "listAlerts", description = "Lists all alerts.", responseObject = AlertResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListAlertsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListAlertsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
index 2b0f827..d79ff07 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.capacity.Capacity;
import com.cloud.exception.InvalidParameterValueException;
-@APICommand(name = "listCapacity", description = "Lists all the system wide capacities.", responseObject = CapacityResponse.class)
+@APICommand(name = "listCapacity", description = "Lists all the system wide capacities.", responseObject = CapacityResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListCapacityCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListCapacityCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
index 68ef5ac..e11876a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
@@ -31,7 +31,8 @@ import com.cloud.user.Account;
@APICommand(name = "uploadCustomCertificate",
responseObject = CustomCertificateResponse.class,
- description = "Uploads a custom certificate for the console proxy VMs to use for SSL. Can be used to upload a single certificate signed by a known CA. Can also be used, through multiple calls, to upload a chain of certificates from CA to the custom certificate itself.")
+ description = "Uploads a custom certificate for the console proxy VMs to use for SSL. Can be used to upload a single certificate signed by a known CA. Can also be used, through multiple calls, to upload a chain of certificates from CA to the custom certificate itself.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UploadCustomCertificateCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UploadCustomCertificateCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
index 75b08b1..7577f2e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
@@ -39,7 +39,8 @@ import com.cloud.network.OvsProvider;
import com.cloud.network.element.VirtualRouterElementService;
import com.cloud.user.Account;
-@APICommand(name = "configureOvsElement", responseObject = OvsProviderResponse.class, description = "Configures an ovs element.")
+@APICommand(name = "configureOvsElement", responseObject = OvsProviderResponse.class, description = "Configures an ovs element.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ConfigureOvsElementCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger
.getLogger(ConfigureOvsElementCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
index 2cfefda..b8fafb6 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
@@ -40,7 +40,8 @@ import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.element.VirtualRouterElementService;
import com.cloud.user.Account;
-@APICommand(name = "configureVirtualRouterElement", responseObject = VirtualRouterProviderResponse.class, description = "Configures a virtual router element.")
+@APICommand(name = "configureVirtualRouterElement", responseObject = VirtualRouterProviderResponse.class, description = "Configures a virtual router element.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ConfigureVirtualRouterElementCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ConfigureVirtualRouterElementCmd.class.getName());
private static final String s_name = "configurevirtualrouterelementresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
index bf5eb18..f43b143 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
@@ -40,7 +40,8 @@ import com.cloud.network.VirtualRouterProvider.Type;
import com.cloud.network.element.VirtualRouterElementService;
import com.cloud.user.Account;
-@APICommand(name = "createVirtualRouterElement", responseObject = VirtualRouterProviderResponse.class, description = "Create a virtual router element.")
+@APICommand(name = "createVirtualRouterElement", responseObject = VirtualRouterProviderResponse.class, description = "Create a virtual router element.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVirtualRouterElementCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateVirtualRouterElementCmd.class.getName());
private static final String s_name = "createvirtualrouterelementresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
index 2ad312e..8b13c51 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.router.VirtualRouter;
import com.cloud.user.Account;
-@APICommand(name = "destroyRouter", description = "Destroys a router.", responseObject = DomainRouterResponse.class)
+@APICommand(name = "destroyRouter", description = "Destroys a router.", responseObject = DomainRouterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DestroyRouterCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DestroyRouterCmd.class.getName());
private static final String s_name = "destroyrouterresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
index d5f73fd..75c6956 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
@@ -39,7 +39,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.OvsProvider;
import com.cloud.network.element.VirtualRouterElementService;
-@APICommand(name = "listOvsElements", description = "Lists all available ovs elements.", responseObject = OvsProviderResponse.class)
+@APICommand(name = "listOvsElements", description = "Lists all available ovs elements.", responseObject = OvsProviderResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListOvsElementsCmd extends BaseListCmd {
public static final Logger s_logger = Logger
.getLogger(ListNetworkOfferingsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
index 9c91e0f..3a5efa2 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
@@ -35,7 +35,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.network.router.VirtualRouter.Role;
-@APICommand(name = "listRouters", description = "List routers.", responseObject = DomainRouterResponse.class)
+@APICommand(name = "listRouters", description = "List routers.", responseObject = DomainRouterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListRoutersCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
index 6f17921..62c6da5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
@@ -40,7 +40,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.element.VirtualRouterElementService;
-@APICommand(name = "listVirtualRouterElements", description = "Lists all available virtual router elements.", responseObject = VirtualRouterProviderResponse.class)
+@APICommand(name = "listVirtualRouterElements", description = "Lists all available virtual router elements.", responseObject = VirtualRouterProviderResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVirtualRouterElementsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkOfferingsCmd.class.getName());
private static final String Name = "listvirtualrouterelementsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
index 15527d3..155e3ee 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.router.VirtualRouter;
import com.cloud.user.Account;
-@APICommand(name = "rebootRouter", description = "Starts a router.", responseObject = DomainRouterResponse.class)
+@APICommand(name = "rebootRouter", description = "Starts a router.", responseObject = DomainRouterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RebootRouterCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RebootRouterCmd.class.getName());
private static final String s_name = "rebootrouterresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
index 9196cd0..ffafb5d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
@@ -37,7 +37,8 @@ import com.cloud.network.router.VirtualRouter;
import com.cloud.network.router.VirtualRouter.Role;
import com.cloud.user.Account;
-@APICommand(name = "startRouter", responseObject = DomainRouterResponse.class, description = "Starts a router.")
+@APICommand(name = "startRouter", responseObject = DomainRouterResponse.class, description = "Starts a router.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class StartRouterCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(StartRouterCmd.class.getName());
private static final String s_name = "startrouterresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
index ee2b9eb..d41cf88 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
@@ -36,7 +36,8 @@ import com.cloud.network.router.VirtualRouter;
import com.cloud.network.router.VirtualRouter.Role;
import com.cloud.user.Account;
-@APICommand(name = "stopRouter", description = "Stops a router.", responseObject = DomainRouterResponse.class)
+@APICommand(name = "stopRouter", description = "Stops a router.", responseObject = DomainRouterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class StopRouterCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(StopRouterCmd.class.getName());
private static final String s_name = "stoprouterresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
index 04a4e67..de195d9 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import com.cloud.network.router.VirtualRouter;
import com.cloud.user.Account;
-@APICommand(name = "changeServiceForRouter", description = "Upgrades domain router to a new service offering", responseObject = DomainRouterResponse.class)
+@APICommand(name = "changeServiceForRouter", description = "Upgrades domain router to a new service offering", responseObject = DomainRouterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpgradeRouterCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeRouterCmd.class.getName());
private static final String s_name = "changeserviceforrouterresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
index 4947745..65d26cc 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
@@ -40,7 +40,8 @@ import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "upgradeRouterTemplate", description = "Upgrades router to use newer template", responseObject = BaseResponse.class)
+@APICommand(name = "upgradeRouterTemplate", description = "Upgrades router to use newer template", responseObject = BaseResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeRouterTemplateCmd.class.getName());
private static final String s_name = "upgraderoutertemplateresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
index 5e5bd3d..6b673cf 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.DiscoveryException;
import com.cloud.storage.ImageStore;
import com.cloud.user.Account;
-@APICommand(name = "addImageStore", description = "Adds backup image store.", responseObject = ImageStoreResponse.class, since = "4.2.0")
+@APICommand(name = "addImageStore", description = "Adds backup image store.", responseObject = ImageStoreResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddImageStoreCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddImageStoreCmd.class.getName());
private static final String s_name = "addimagestoreresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
index 32897e4..8a82e89 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java
@@ -52,7 +52,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.ImageStore;
-@APICommand(name = "addS3", description = "Adds S3", responseObject = ImageStoreResponse.class, since = "4.0.0")
+@APICommand(name = "addS3", description = "Adds S3", responseObject = ImageStoreResponse.class, since = "4.0.0",
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public final class AddS3Cmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddS3Cmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
index b1c5594..91348ec 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CancelPrimaryStorageMaintenanceCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.StoragePool;
import com.cloud.user.Account;
-@APICommand(name = "cancelStorageMaintenance", description = "Cancels maintenance for primary storage", responseObject = StoragePoolResponse.class)
+@APICommand(name = "cancelStorageMaintenance", description = "Cancels maintenance for primary storage", responseObject = StoragePoolResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CancelPrimaryStorageMaintenanceCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CancelPrimaryStorageMaintenanceCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
index 1480e75..39ec609 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
@@ -37,7 +37,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.storage.ImageStore;
import com.cloud.user.Account;
-@APICommand(name = "createSecondaryStagingStore", description = "create secondary staging store.", responseObject = ImageStoreResponse.class)
+@APICommand(name = "createSecondaryStagingStore", description = "create secondary staging store.", responseObject = ImageStoreResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateSecondaryStagingStoreCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddImageStoreCmd.class.getName());
private static final String s_name = "createsecondarystagingstoreresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
index dfd0026..ae44bc9 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
@@ -38,7 +38,8 @@ import com.cloud.storage.StoragePool;
import com.cloud.user.Account;
@SuppressWarnings("rawtypes")
-@APICommand(name = "createStoragePool", description = "Creates a storage pool.", responseObject = StoragePoolResponse.class)
+@APICommand(name = "createStoragePool", description = "Creates a storage pool.", responseObject = StoragePoolResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateStoragePoolCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateStoragePoolCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
index 602da83..669c0ec 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
-@APICommand(name = "deleteImageStore", description = "Deletes an image store .", responseObject = SuccessResponse.class, since = "4.2.0")
+@APICommand(name = "deleteImageStore", description = "Deletes an image store .", responseObject = SuccessResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteImageStoreCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteImageStoreCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
index fb63daa..5465fd1 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
@@ -31,7 +31,8 @@ import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolStatus;
import com.cloud.user.Account;
-@APICommand(name = "deleteStoragePool", description = "Deletes a storage pool.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteStoragePool", description = "Deletes a storage pool.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeletePoolCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeletePoolCmd.class.getName());
private static final String s_name = "deletestoragepoolresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
index caf937f..1639862 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
-@APICommand(name = "deleteSecondaryStagingStore", description = "Deletes a secondary staging store .", responseObject = SuccessResponse.class, since = "4.2.0")
+@APICommand(name = "deleteSecondaryStagingStore", description = "Deletes a secondary staging store .", responseObject = SuccessResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSecondaryStagingStoreCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteSecondaryStagingStoreCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
index 10813ca..47fa965 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.VolumeResponse;
import com.cloud.storage.StoragePool;
import com.cloud.utils.Pair;
-@APICommand(name = "findStoragePoolsForMigration", description = "Lists storage pools available for migration of a volume.", responseObject = StoragePoolResponse.class)
+@APICommand(name = "findStoragePoolsForMigration", description = "Lists storage pools available for migration of a volume.", responseObject = StoragePoolResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class FindStoragePoolsForMigrationCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(FindStoragePoolsForMigrationCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
index bf47084..8c37c78 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
@@ -26,7 +26,8 @@ import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-@APICommand(name = "listImageStores", description = "Lists image stores.", responseObject = ImageStoreResponse.class, since = "4.2.0")
+@APICommand(name = "listImageStores", description = "Lists image stores.", responseObject = ImageStoreResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListImageStoresCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListImageStoresCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java
index 362d69e..c1889e7 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java
@@ -30,7 +30,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
-@APICommand(name = "listS3s", description = "Lists S3s", responseObject = ImageStoreResponse.class, since = "4.0.0")
+@APICommand(name = "listS3s", description = "Lists S3s", responseObject = ImageStoreResponse.class, since = "4.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListS3sCmd extends BaseListCmd {
private static final String COMMAND_NAME = "lists3sresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
index 171f971..e315c8a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListSecondaryStagingStoresCmd.java
@@ -26,7 +26,8 @@ import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-@APICommand(name = "listSecondaryStagingStores", description = "Lists secondary staging stores.", responseObject = ImageStoreResponse.class, since = "4.2.0")
+@APICommand(name = "listSecondaryStagingStores", description = "Lists secondary staging stores.", responseObject = ImageStoreResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSecondaryStagingStoresCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListSecondaryStagingStoresCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
index 868b402..ed123db 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-@APICommand(name = "listStoragePools", description = "Lists storage pools.", responseObject = StoragePoolResponse.class)
+@APICommand(name = "listStoragePools", description = "Lists storage pools.", responseObject = StoragePoolResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListStoragePoolsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListStoragePoolsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
index bac6b7c..3e960ee 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
-@APICommand(name = "listStorageProviders", description = "Lists storage providers.", responseObject = StorageProviderResponse.class)
+@APICommand(name = "listStorageProviders", description = "Lists storage providers.", responseObject = StorageProviderResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListStorageProvidersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListStorageProvidersCmd.class.getName());
private static final String s_name = "liststorageprovidersresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
index 9d11966..cf5fdf6 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/PreparePrimaryStorageForMaintenanceCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.StoragePool;
import com.cloud.user.Account;
-@APICommand(name = "enableStorageMaintenance", description = "Puts storage pool into maintenance state", responseObject = StoragePoolResponse.class)
+@APICommand(name = "enableStorageMaintenance", description = "Puts storage pool into maintenance state", responseObject = StoragePoolResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class PreparePrimaryStorageForMaintenanceCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(PreparePrimaryStorageForMaintenanceCmd.class.getName());
private static final String s_name = "prepareprimarystorageformaintenanceresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
index 983a01c..a99c5e5 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.DiscoveryException;
import com.cloud.storage.ImageStore;
import com.cloud.user.Account;
-@APICommand(name = "updateCloudToUseObjectStore", description = "Migrate current NFS secondary storages to use object store.", responseObject = ImageStoreResponse.class, since = "4.3.0")
+@APICommand(name = "updateCloudToUseObjectStore", description = "Migrate current NFS secondary storages to use object store.", responseObject = ImageStoreResponse.class, since = "4.3.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateCloudToUseObjectStoreCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateCloudToUseObjectStoreCmd.class.getName());
private static final String s_name = "updatecloudtouseobjectstoreresponse";
[08/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/User.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/User.java b/deps/XenServerJava/src/com/xensource/xenapi/User.java
index dff27f5..4a01d60 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/User.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/User.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class User extends XenAPIObject {
* For internal use only.
*/
User(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class User extends XenAPIObject {
{
if (obj != null && obj instanceof User)
{
- User other = (User)obj;
+ User other = (User) obj;
return other.ref.equals(this.ref);
} else
{
@@ -109,8 +110,8 @@ public class User extends XenAPIObject {
/**
* Convert a user.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("short_name", this.shortName == null ? "" : this.shortName);
map.put("fullname", this.fullname == null ? "" : this.fullname);
@@ -142,17 +143,16 @@ public class User extends XenAPIObject {
*
* @return all fields from the object
*/
- @Deprecated
- public User.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public User.Record getRecord(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toUserRecord(result);
+ return Types.toUserRecord(result);
}
/**
@@ -162,17 +162,16 @@ public class User extends XenAPIObject {
* @param uuid UUID of object to return
* @return reference to the object
*/
- @Deprecated
- public static User getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public static User getByUuid(Connection c, String uuid) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toUser(result);
+ return Types.toUser(result);
}
/**
@@ -182,11 +181,10 @@ public class User extends XenAPIObject {
* @param record All constructor arguments
* @return Task
*/
- @Deprecated
- public static Task createAsync(Connection c, User.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public static Task createAsync(Connection c, User.Record record) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.user.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -203,18 +201,17 @@ public class User extends XenAPIObject {
* @param record All constructor arguments
* @return reference to the newly created object
*/
- @Deprecated
- public static User create(Connection c, User.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public static User create(Connection c, User.Record record) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toUser(result);
+ return Types.toUser(result);
}
/**
@@ -223,11 +220,10 @@ public class User extends XenAPIObject {
*
* @return Task
*/
- @Deprecated
- public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public Task destroyAsync(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.user.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -241,11 +237,10 @@ public class User extends XenAPIObject {
* @deprecated
*
*/
- @Deprecated
- public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public void destroy(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -259,15 +254,15 @@ public class User extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -276,15 +271,15 @@ public class User extends XenAPIObject {
* @return value of the field
*/
public String getShortName(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.get_short_name";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -293,15 +288,15 @@ public class User extends XenAPIObject {
* @return value of the field
*/
public String getFullname(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.get_fullname";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -310,15 +305,15 @@ public class User extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -327,9 +322,9 @@ public class User extends XenAPIObject {
* @param fullname New value to set
*/
public void setFullname(Connection c, String fullname) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.set_fullname";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(fullname)};
@@ -343,9 +338,9 @@ public class User extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -360,9 +355,9 @@ public class User extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -376,9 +371,9 @@ public class User extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "user.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VBD.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VBD.java b/deps/XenServerJava/src/com/xensource/xenapi/VBD.java
index 56e6f4b..72edf38 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VBD.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VBD.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VBD extends XenAPIObject {
* For internal use only.
*/
VBD(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VBD extends XenAPIObject {
{
if (obj != null && obj instanceof VBD)
{
- VBD other = (VBD)obj;
+ VBD other = (VBD) obj;
return other.ref.equals(this.ref);
} else
{
@@ -127,8 +128,8 @@ public class VBD extends XenAPIObject {
/**
* Convert a VBD.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("allowed_operations", this.allowedOperations == null ? new LinkedHashSet<Types.VbdOperations>() : this.allowedOperations);
map.put("current_operations", this.currentOperations == null ? new HashMap<String, Types.VbdOperations>() : this.currentOperations);
@@ -250,15 +251,15 @@ public class VBD extends XenAPIObject {
* @return all fields from the object
*/
public VBD.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVBDRecord(result);
+ return Types.toVBDRecord(result);
}
/**
@@ -268,15 +269,15 @@ public class VBD extends XenAPIObject {
* @return reference to the object
*/
public static VBD getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVBD(result);
+ return Types.toVBD(result);
}
/**
@@ -286,9 +287,9 @@ public class VBD extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, VBD.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VBD.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -305,16 +306,16 @@ public class VBD extends XenAPIObject {
* @return reference to the newly created object
*/
public static VBD create(Connection c, VBD.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVBD(result);
+ return Types.toVBD(result);
}
/**
@@ -323,9 +324,9 @@ public class VBD extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VBD.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -339,9 +340,9 @@ public class VBD extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -355,15 +356,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -372,15 +373,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Set<Types.VbdOperations> getAllowedOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_allowed_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVbdOperations(result);
+ return Types.toSetOfVbdOperations(result);
}
/**
@@ -389,15 +390,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Map<String, Types.VbdOperations> getCurrentOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_current_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringVbdOperations(result);
+ return Types.toMapOfStringVbdOperations(result);
}
/**
@@ -406,15 +407,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public VM getVM(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_VM";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -423,15 +424,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public VDI getVDI(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_VDI";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVDI(result);
+ return Types.toVDI(result);
}
/**
@@ -440,15 +441,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public String getDevice(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_device";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -457,15 +458,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public String getUserdevice(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_userdevice";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -474,15 +475,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Boolean getBootable(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_bootable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -491,15 +492,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Types.VbdMode getMode(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVbdMode(result);
+ return Types.toVbdMode(result);
}
/**
@@ -508,15 +509,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Types.VbdType getType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVbdType(result);
+ return Types.toVbdType(result);
}
/**
@@ -525,15 +526,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Boolean getUnpluggable(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_unpluggable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -542,15 +543,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Boolean getStorageLock(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_storage_lock";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -559,15 +560,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Boolean getEmpty(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_empty";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -576,15 +577,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -593,15 +594,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Boolean getCurrentlyAttached(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_currently_attached";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -610,15 +611,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Long getStatusCode(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_status_code";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -627,15 +628,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public String getStatusDetail(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_status_detail";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -644,15 +645,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getRuntimeProperties(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_runtime_properties";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -661,15 +662,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public String getQosAlgorithmType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_qos_algorithm_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -678,15 +679,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getQosAlgorithmParams(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_qos_algorithm_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -695,15 +696,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public Set<String> getQosSupportedAlgorithms(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_qos_supported_algorithms";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -712,15 +713,15 @@ public class VBD extends XenAPIObject {
* @return value of the field
*/
public VBDMetrics getMetrics(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_metrics";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVBDMetrics(result);
+ return Types.toVBDMetrics(result);
}
/**
@@ -729,9 +730,9 @@ public class VBD extends XenAPIObject {
* @param userdevice New value to set
*/
public void setUserdevice(Connection c, String userdevice) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.set_userdevice";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(userdevice)};
@@ -745,9 +746,9 @@ public class VBD extends XenAPIObject {
* @param bootable New value to set
*/
public void setBootable(Connection c, Boolean bootable) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.set_bootable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(bootable)};
@@ -761,9 +762,9 @@ public class VBD extends XenAPIObject {
* @param mode New value to set
*/
public void setMode(Connection c, Types.VbdMode mode) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.set_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(mode)};
@@ -777,9 +778,9 @@ public class VBD extends XenAPIObject {
* @param type New value to set
*/
public void setType(Connection c, Types.VbdType type) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.set_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(type)};
@@ -793,9 +794,9 @@ public class VBD extends XenAPIObject {
* @param unpluggable New value to set
*/
public void setUnpluggable(Connection c, Boolean unpluggable) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.set_unpluggable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(unpluggable)};
@@ -809,9 +810,9 @@ public class VBD extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -826,9 +827,9 @@ public class VBD extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -842,9 +843,9 @@ public class VBD extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -858,9 +859,9 @@ public class VBD extends XenAPIObject {
* @param algorithmType New value to set
*/
public void setQosAlgorithmType(Connection c, String algorithmType) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.set_qos_algorithm_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(algorithmType)};
@@ -874,9 +875,9 @@ public class VBD extends XenAPIObject {
* @param algorithmParams New value to set
*/
public void setQosAlgorithmParams(Connection c, Map<String, String> algorithmParams) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.set_qos_algorithm_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(algorithmParams)};
@@ -891,9 +892,9 @@ public class VBD extends XenAPIObject {
* @param value Value to add
*/
public void addToQosAlgorithmParams(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.add_to_qos_algorithm_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -907,9 +908,9 @@ public class VBD extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromQosAlgorithmParams(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.remove_from_qos_algorithm_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -923,11 +924,11 @@ public class VBD extends XenAPIObject {
* @return Task
*/
public Task ejectAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VbdNotRemovableMedia,
- Types.VbdIsEmpty {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VbdNotRemovableMedia,
+ Types.VbdIsEmpty {
String method_call = "Async.VBD.eject";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -941,11 +942,11 @@ public class VBD extends XenAPIObject {
*
*/
public void eject(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VbdNotRemovableMedia,
- Types.VbdIsEmpty {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VbdNotRemovableMedia,
+ Types.VbdIsEmpty {
String method_call = "VBD.eject";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -960,11 +961,11 @@ public class VBD extends XenAPIObject {
* @return Task
*/
public Task insertAsync(Connection c, VDI vdi) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VbdNotRemovableMedia,
- Types.VbdNotEmpty {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VbdNotRemovableMedia,
+ Types.VbdNotEmpty {
String method_call = "Async.VBD.insert";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(vdi)};
@@ -979,11 +980,11 @@ public class VBD extends XenAPIObject {
* @param vdi The new VDI to 'insert'
*/
public void insert(Connection c, VDI vdi) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VbdNotRemovableMedia,
- Types.VbdNotEmpty {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VbdNotRemovableMedia,
+ Types.VbdNotEmpty {
String method_call = "VBD.insert";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(vdi)};
@@ -997,9 +998,9 @@ public class VBD extends XenAPIObject {
* @return Task
*/
public Task plugAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VBD.plug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1013,9 +1014,9 @@ public class VBD extends XenAPIObject {
*
*/
public void plug(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.plug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1029,11 +1030,11 @@ public class VBD extends XenAPIObject {
* @return Task
*/
public Task unplugAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.DeviceDetachRejected,
- Types.DeviceAlreadyDetached {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.DeviceDetachRejected,
+ Types.DeviceAlreadyDetached {
String method_call = "Async.VBD.unplug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1047,11 +1048,11 @@ public class VBD extends XenAPIObject {
*
*/
public void unplug(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.DeviceDetachRejected,
- Types.DeviceAlreadyDetached {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.DeviceDetachRejected,
+ Types.DeviceAlreadyDetached {
String method_call = "VBD.unplug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1065,9 +1066,9 @@ public class VBD extends XenAPIObject {
* @return Task
*/
public Task unplugForceAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VBD.unplug_force";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1081,9 +1082,9 @@ public class VBD extends XenAPIObject {
*
*/
public void unplugForce(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.unplug_force";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1097,9 +1098,9 @@ public class VBD extends XenAPIObject {
* @return Task
*/
public Task assertAttachableAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VBD.assert_attachable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1113,9 +1114,9 @@ public class VBD extends XenAPIObject {
*
*/
public void assertAttachable(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.assert_attachable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1129,15 +1130,15 @@ public class VBD extends XenAPIObject {
* @return references to all objects
*/
public static Set<VBD> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVBD(result);
+ return Types.toSetOfVBD(result);
}
/**
@@ -1146,15 +1147,15 @@ public class VBD extends XenAPIObject {
* @return records of all objects
*/
public static Map<VBD, VBD.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVBDVBDRecord(result);
+ return Types.toMapOfVBDVBDRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VBDMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VBDMetrics.java b/deps/XenServerJava/src/com/xensource/xenapi/VBDMetrics.java
index 1f678fa..a58e5e0 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VBDMetrics.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VBDMetrics.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VBDMetrics extends XenAPIObject {
* For internal use only.
*/
VBDMetrics(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VBDMetrics extends XenAPIObject {
{
if (obj != null && obj instanceof VBDMetrics)
{
- VBDMetrics other = (VBDMetrics)obj;
+ VBDMetrics other = (VBDMetrics) obj;
return other.ref.equals(this.ref);
} else
{
@@ -110,8 +111,8 @@ public class VBDMetrics extends XenAPIObject {
/**
* Convert a VBD_metrics.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("io_read_kbs", this.ioReadKbs == null ? 0.0 : this.ioReadKbs);
map.put("io_write_kbs", this.ioWriteKbs == null ? 0.0 : this.ioWriteKbs);
@@ -148,15 +149,15 @@ public class VBDMetrics extends XenAPIObject {
* @return all fields from the object
*/
public VBDMetrics.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVBDMetricsRecord(result);
+ return Types.toVBDMetricsRecord(result);
}
/**
@@ -166,15 +167,15 @@ public class VBDMetrics extends XenAPIObject {
* @return reference to the object
*/
public static VBDMetrics getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVBDMetrics(result);
+ return Types.toVBDMetrics(result);
}
/**
@@ -183,15 +184,15 @@ public class VBDMetrics extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -200,15 +201,15 @@ public class VBDMetrics extends XenAPIObject {
* @return value of the field
*/
public Double getIoReadKbs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.get_io_read_kbs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDouble(result);
+ return Types.toDouble(result);
}
/**
@@ -217,15 +218,15 @@ public class VBDMetrics extends XenAPIObject {
* @return value of the field
*/
public Double getIoWriteKbs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.get_io_write_kbs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDouble(result);
+ return Types.toDouble(result);
}
/**
@@ -234,15 +235,15 @@ public class VBDMetrics extends XenAPIObject {
* @return value of the field
*/
public Date getLastUpdated(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.get_last_updated";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -251,15 +252,15 @@ public class VBDMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -268,9 +269,9 @@ public class VBDMetrics extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -285,9 +286,9 @@ public class VBDMetrics extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -301,9 +302,9 @@ public class VBDMetrics extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -317,15 +318,15 @@ public class VBDMetrics extends XenAPIObject {
* @return references to all objects
*/
public static Set<VBDMetrics> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVBDMetrics(result);
+ return Types.toSetOfVBDMetrics(result);
}
/**
@@ -334,15 +335,15 @@ public class VBDMetrics extends XenAPIObject {
* @return records of all objects
*/
public static Map<VBDMetrics, VBDMetrics.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VBD_metrics.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVBDMetricsVBDMetricsRecord(result);
+ return Types.toMapOfVBDMetricsVBDMetricsRecord(result);
}
}
\ No newline at end of file
[50/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
loadCidrs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e90d595d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e90d595d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e90d595d
Branch: refs/heads/acl-item-cidrs
Commit: e90d595d3596ab710fc62f71b43ada6156e2b41e
Parents: e7dacdf
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Feb 26 19:49:12 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Feb 26 19:49:12 2014 +0100
----------------------------------------------------------------------
.../src/com/cloud/network/vpc/NetworkACLItemVO.java | 5 +++++
.../network/vpc/dao/NetworkACLItemDaoImpl.java | 16 ++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e90d595d/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
index 24ec1b9..1317b6f 100644
--- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
+++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
@@ -37,6 +37,11 @@ import com.cloud.utils.net.NetUtils;
@Table(name = "network_acl_item")
public class NetworkACLItemVO implements NetworkACLItem {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2790623532888742060L;
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e90d595d/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
index b581d3e..c940247 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
@@ -84,6 +84,13 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long
}
@Override
+ public NetworkACLItemVO findById(Long id) {
+ NetworkACLItemVO item = super.findById(id);
+ loadCidrs(item);
+ return item;
+ }
+
+ @Override
public boolean setStateToAdd(NetworkACLItemVO rule) {
SearchCriteria<NetworkACLItemVO> sc = AllFieldsSearch.create();
sc.setParameters("id", rule.getId());
@@ -104,7 +111,10 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long
public List<NetworkACLItemVO> listByACL(long aclId) {
SearchCriteria<NetworkACLItemVO> sc = AllFieldsSearch.create();
sc.setParameters("aclId", aclId);
-
+ List<NetworkACLItemVO> list = listBy(sc);
+ for(NetworkACLItemVO item :list) {
+ loadCidrs(item);
+ }
return listBy(sc);
}
@@ -121,7 +131,9 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long
SearchCriteria<NetworkACLItemVO> sc = AllFieldsSearch.create();
sc.setParameters("aclId", aclId);
sc.setParameters("number", number);
- return findOneBy(sc);
+ NetworkACLItemVO vo = findOneBy(sc);
+ loadCidrs(vo);
+ return vo;
}
@Override
[35/50] [abbrv] - Updated APICommand annotation to add new flags that
indicate if API request or response carry sensitive info - Updated all API
classes with the new annotation flag values as per the API's sensitivity -
Updated server code to check respo
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java
----------------------------------------------------------------------
diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java b/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java
index 9e415e6..fab68e3 100644
--- a/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java
+++ b/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/admin/ratelimit/ResetApiLimitCmd.java
@@ -37,7 +37,8 @@ import org.apache.cloudstack.ratelimit.ApiRateLimitService;
import com.cloud.configuration.Config;
import com.cloud.user.Account;
-@APICommand(name = "resetApiLimit", responseObject = ApiLimitResponse.class, description = "Reset api count")
+@APICommand(name = "resetApiLimit", responseObject = ApiLimitResponse.class, description = "Reset api count",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ResetApiLimitCmd extends BaseCmd {
private static final Logger s_logger = Logger.getLogger(ResetApiLimitCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java
----------------------------------------------------------------------
diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java b/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java
index 2428895..51b2064 100644
--- a/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java
+++ b/plugins/api/rate-limit/src/org/apache/cloudstack/api/command/user/ratelimit/GetApiLimitCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.ratelimit.ApiRateLimitService;
import com.cloud.configuration.Config;
import com.cloud.user.Account;
-@APICommand(name = "getApiLimit", responseObject = ApiLimitResponse.class, description = "Get API limit count for the caller")
+@APICommand(name = "getApiLimit", responseObject = ApiLimitResponse.class, description = "Get API limit count for the caller",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class GetApiLimitCmd extends BaseCmd {
private static final Logger s_logger = Logger.getLogger(GetApiLimitCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java
index 4f8cd8c..9ef642e 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java
@@ -39,7 +39,8 @@ import com.cloud.dc.DedicatedResources;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "dedicateCluster", description = "Dedicate an existing cluster", responseObject = DedicateClusterResponse.class)
+@APICommand(name = "dedicateCluster", description = "Dedicate an existing cluster", responseObject = DedicateClusterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DedicateClusterCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DedicateClusterCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java
index d3cce5a..978821a 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java
@@ -39,7 +39,8 @@ import com.cloud.dc.DedicatedResources;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "dedicateHost", description = "Dedicates a host.", responseObject = DedicateHostResponse.class)
+@APICommand(name = "dedicateHost", description = "Dedicates a host.", responseObject = DedicateHostResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DedicateHostCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DedicateHostCmd.class.getName());
private static final String s_name = "dedicatehostresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java
index e823fd5..d18f02d 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java
@@ -39,7 +39,8 @@ import com.cloud.dc.DedicatedResources;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "dedicatePod", description = "Dedicates a Pod.", responseObject = DedicatePodResponse.class)
+@APICommand(name = "dedicatePod", description = "Dedicates a Pod.", responseObject = DedicatePodResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DedicatePodCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DedicatePodCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java
index 0e427aa..ee71dfe 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java
@@ -39,7 +39,8 @@ import com.cloud.dc.DedicatedResources;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "dedicateZone", description = "Dedicates a zones.", responseObject = DedicateZoneResponse.class)
+@APICommand(name = "dedicateZone", description = "Dedicates a zones.", responseObject = DedicateZoneResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DedicateZoneCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DedicateZoneCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java
index a2022a5..a8c192d 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java
@@ -40,7 +40,8 @@ import com.cloud.dc.DedicatedResourceVO;
import com.cloud.dc.DedicatedResources;
import com.cloud.utils.Pair;
-@APICommand(name = "listDedicatedClusters", description = "Lists dedicated clusters.", responseObject = DedicateClusterResponse.class)
+@APICommand(name = "listDedicatedClusters", description = "Lists dedicated clusters.", responseObject = DedicateClusterResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListDedicatedClustersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDedicatedClustersCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java
index d3b326d..3c167e8 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java
@@ -40,7 +40,8 @@ import com.cloud.dc.DedicatedResourceVO;
import com.cloud.dc.DedicatedResources;
import com.cloud.utils.Pair;
-@APICommand(name = "listDedicatedHosts", description = "Lists dedicated hosts.", responseObject = DedicateHostResponse.class)
+@APICommand(name = "listDedicatedHosts", description = "Lists dedicated hosts.", responseObject = DedicateHostResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListDedicatedHostsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDedicatedHostsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java
index d7cd4c2..5198e49 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java
@@ -40,7 +40,8 @@ import com.cloud.dc.DedicatedResourceVO;
import com.cloud.dc.DedicatedResources;
import com.cloud.utils.Pair;
-@APICommand(name = "listDedicatedPods", description = "Lists dedicated pods.", responseObject = DedicatePodResponse.class)
+@APICommand(name = "listDedicatedPods", description = "Lists dedicated pods.", responseObject = DedicatePodResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListDedicatedPodsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDedicatedPodsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java
index 07b8b19..e75b73b 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java
@@ -40,7 +40,8 @@ import com.cloud.dc.DedicatedResourceVO;
import com.cloud.dc.DedicatedResources;
import com.cloud.utils.Pair;
-@APICommand(name = "listDedicatedZones", description = "List dedicated zones.", responseObject = DedicateZoneResponse.class)
+@APICommand(name = "listDedicatedZones", description = "List dedicated zones.", responseObject = DedicateZoneResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListDedicatedZonesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDedicatedZonesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java
index e065da2..b1ec360 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.dedicated.DedicatedService;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "releaseDedicatedCluster", description = "Release the dedication for cluster", responseObject = SuccessResponse.class)
+@APICommand(name = "releaseDedicatedCluster", description = "Release the dedication for cluster", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReleaseDedicatedClusterCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedClusterCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java
index 41e668c..bddef13 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedHostCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.dedicated.DedicatedService;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "releaseDedicatedHost", description = "Release the dedication for host", responseObject = SuccessResponse.class)
+@APICommand(name = "releaseDedicatedHost", description = "Release the dedication for host", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReleaseDedicatedHostCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedHostCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java
index 47ea475..f764e8a 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedPodCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.dedicated.DedicatedService;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "releaseDedicatedPod", description = "Release the dedication for the pod", responseObject = SuccessResponse.class)
+@APICommand(name = "releaseDedicatedPod", description = "Release the dedication for the pod", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReleaseDedicatedPodCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedPodCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java
index 69185d6..df04491 100644
--- a/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java
+++ b/plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedZoneCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.dedicated.DedicatedService;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "releaseDedicatedZone", description = "Release dedication of zone", responseObject = SuccessResponse.class)
+@APICommand(name = "releaseDedicatedZone", description = "Release dedication of zone", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReleaseDedicatedZoneCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedZoneCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java
index b698daa..dadfe44 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/AssociateLunCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.netapp.NetappManager;
import com.cloud.server.api.response.netapp.AssociateLunCmdResponse;
-@APICommand(name = "associateLun", description = "Associate a LUN with a guest IQN", responseObject = AssociateLunCmdResponse.class)
+@APICommand(name = "associateLun", description = "Associate a LUN with a guest IQN", responseObject = AssociateLunCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AssociateLunCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AssociateLunCmd.class.getName());
private static final String s_name = "associatelunresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java
index 86b2497..6700479 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateLunCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.netapp.NetappManager;
import com.cloud.server.api.response.netapp.CreateLunCmdResponse;
-@APICommand(name = "createLunOnFiler", description = "Create a LUN from a pool", responseObject = CreateLunCmdResponse.class)
+@APICommand(name = "createLunOnFiler", description = "Create a LUN from a pool", responseObject = CreateLunCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateLunCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateLunCmd.class.getName());
private static final String s_name = "createlunresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java
index e79aa14..b1e6a29 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumeOnFilerCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.netapp.NetappManager;
import com.cloud.server.api.response.netapp.CreateVolumeOnFilerCmdResponse;
-@APICommand(name = "createVolumeOnFiler", description = "Create a volume", responseObject = CreateVolumeOnFilerCmdResponse.class)
+@APICommand(name = "createVolumeOnFiler", description = "Create a volume", responseObject = CreateVolumeOnFilerCmdResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class CreateVolumeOnFilerCmd extends BaseCmd {
private static final String s_name = "createvolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java
index ba74933..d2eeb87 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/CreateVolumePoolCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.netapp.NetappManager;
import com.cloud.server.api.response.netapp.CreateVolumePoolCmdResponse;
-@APICommand(name = "createPool", description = "Create a pool", responseObject = CreateVolumePoolCmdResponse.class)
+@APICommand(name = "createPool", description = "Create a pool", responseObject = CreateVolumePoolCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVolumePoolCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateVolumePoolCmd.class.getName());
private static final String s_name = "createpoolresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java
index 1d221e9..6f51cc6 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DeleteVolumePoolCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.netapp.NetappManager;
import com.cloud.server.api.response.netapp.DeleteVolumePoolCmdResponse;
-@APICommand(name = "deletePool", description = "Delete a pool", responseObject = DeleteVolumePoolCmdResponse.class)
+@APICommand(name = "deletePool", description = "Delete a pool", responseObject = DeleteVolumePoolCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteVolumePoolCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVolumePoolCmd.class.getName());
private static final String s_name = "deletepoolresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java
index e0c0eb7..cfdc1da 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyLunCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.netapp.NetappManager;
import com.cloud.server.api.response.netapp.DeleteLUNCmdResponse;
-@APICommand(name = "destroyLunOnFiler", description = "Destroy a LUN", responseObject = DeleteLUNCmdResponse.class)
+@APICommand(name = "destroyLunOnFiler", description = "Destroy a LUN", responseObject = DeleteLUNCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DestroyLunCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DestroyLunCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java
index 680c4e5..500a84c 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DestroyVolumeOnFilerCmd.java
@@ -38,7 +38,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.netapp.NetappManager;
import com.cloud.server.api.response.netapp.DeleteVolumeOnFilerCmdResponse;
-@APICommand(name = "destroyVolumeOnFiler", description = "Destroy a Volume", responseObject = DeleteVolumeOnFilerCmdResponse.class)
+@APICommand(name = "destroyVolumeOnFiler", description = "Destroy a Volume", responseObject = DeleteVolumeOnFilerCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DestroyVolumeOnFilerCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DestroyVolumeOnFilerCmd.class.getName());
private static final String s_name = "destroyvolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java
index 4ea9684..d5c53a1 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/DissociateLunCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.netapp.NetappManager;
import com.cloud.server.api.response.netapp.DissociateLunCmdResponse;
-@APICommand(name = "dissociateLun", description = "Dissociate a LUN", responseObject = DissociateLunCmdResponse.class)
+@APICommand(name = "dissociateLun", description = "Dissociate a LUN", responseObject = DissociateLunCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DissociateLunCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DissociateLunCmd.class.getName());
private static final String s_name = "dissociatelunresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java
index 04e64f3..c1e1fb8 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java
@@ -40,7 +40,8 @@ import com.cloud.netapp.LunVO;
import com.cloud.netapp.NetappManager;
import com.cloud.server.api.response.netapp.ListLunsCmdResponse;
-@APICommand(name = "listLunsOnFiler", description = "List LUN", responseObject = ListLunsCmdResponse.class)
+@APICommand(name = "listLunsOnFiler", description = "List LUN", responseObject = ListLunsCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListLunsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ListLunsCmd.class.getName());
private static final String s_name = "listlunresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java
index 9e650e0..f6d17c0 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java
@@ -38,7 +38,8 @@ import com.cloud.netapp.NetappManager;
import com.cloud.netapp.PoolVO;
import com.cloud.server.api.response.netapp.ListVolumePoolsCmdResponse;
-@APICommand(name = "listPools", description = "List Pool", responseObject = ListVolumePoolsCmdResponse.class)
+@APICommand(name = "listPools", description = "List Pool", responseObject = ListVolumePoolsCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVolumePoolsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ListVolumePoolsCmd.class.getName());
private static final String s_name = "listpoolresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java
index 38c91b7..bf72b3a 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java
@@ -40,7 +40,8 @@ import com.cloud.netapp.NetappManager;
import com.cloud.netapp.NetappVolumeVO;
import com.cloud.server.api.response.netapp.ListVolumesOnFilerCmdResponse;
-@APICommand(name = "listVolumesOnFiler", description = "List Volumes", responseObject = ListVolumesOnFilerCmdResponse.class)
+@APICommand(name = "listVolumesOnFiler", description = "List Volumes", responseObject = ListVolumesOnFilerCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVolumesOnFilerCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ListVolumesOnFilerCmd.class.getName());
private static final String s_name = "listvolumesresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java
index 94d5de5..a5849df 100644
--- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java
+++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ModifyVolumePoolCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.netapp.NetappManager;
import com.cloud.server.api.response.netapp.ModifyVolumePoolCmdResponse;
-@APICommand(name = "modifyPool", description = "Modify pool", responseObject = ModifyVolumePoolCmdResponse.class)
+@APICommand(name = "modifyPool", description = "Modify pool", responseObject = ModifyVolumePoolCmdResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ModifyVolumePoolCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ModifyVolumePoolCmd.class.getName());
private static final String s_name = "modifypoolresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java
index 529f988..ab014d0 100755
--- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java
+++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalDhcpCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
-@APICommand(name = "addBaremetalDhcp", description = "adds a baremetal dhcp server", responseObject = BaremetalDhcpResponse.class)
+@APICommand(name = "addBaremetalDhcp", description = "adds a baremetal dhcp server", responseObject = BaremetalDhcpResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddBaremetalDhcpCmd extends BaseAsyncCmd {
private static final String s_name = "addbaremetaldhcpresponse";
public static final Logger s_logger = Logger.getLogger(AddBaremetalDhcpCmd.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java
index 40ee6de..b876c68 100755
--- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java
+++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalHostCmd.java
@@ -23,7 +23,8 @@ import org.apache.cloudstack.api.response.HostResponse;
import com.cloud.baremetal.manager.BareMetalDiscoverer;
-@APICommand(name = "addBaremetalHost", description = "add a baremetal host", responseObject = HostResponse.class)
+@APICommand(name = "addBaremetalHost", description = "add a baremetal host", responseObject = HostResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddBaremetalHostCmd extends AddHostCmd {
@Parameter(name = ApiConstants.IP_ADDRESS, type = CommandType.STRING, description = "ip address intentionally allocated to this host after provisioning")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java
index ac8d9c7..2c3a68c 100755
--- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java
+++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalKickStartPxeCmd.java
@@ -20,7 +20,8 @@ package org.apache.cloudstack.api;
import com.cloud.baremetal.networkservice.BaremetalPxeKickStartResponse;
-@APICommand(name = "addBaremetalPxeKickStartServer", description = "add a baremetal pxe server", responseObject = BaremetalPxeKickStartResponse.class)
+@APICommand(name = "addBaremetalPxeKickStartServer", description = "add a baremetal pxe server", responseObject = BaremetalPxeKickStartResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddBaremetalKickStartPxeCmd extends AddBaremetalPxeCmd {
@Parameter(name = ApiConstants.TFTP_DIR, type = CommandType.STRING, required = true, description = "Tftp root directory of PXE server")
private String tftpDir;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java
index b128a62..32f6fae 100755
--- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java
+++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/AddBaremetalPxePingServerCmd.java
@@ -20,7 +20,8 @@ package org.apache.cloudstack.api;
import com.cloud.baremetal.networkservice.BaremetalPxePingResponse;
-@APICommand(name = "addBaremetalPxePingServer", description = "add a baremetal ping pxe server", responseObject = BaremetalPxePingResponse.class)
+@APICommand(name = "addBaremetalPxePingServer", description = "add a baremetal ping pxe server", responseObject = BaremetalPxePingResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class AddBaremetalPxePingServerCmd extends AddBaremetalPxeCmd {
@Parameter(name = ApiConstants.PING_STORAGE_SERVER_IP, type = CommandType.STRING, required = true, description = "PING storage server ip")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java
index 7d0aba3..b159810 100755
--- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java
+++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
-@APICommand(name = "listBaremetalDhcp", description = "list baremetal dhcp servers", responseObject = BaremetalDhcpResponse.class)
+@APICommand(name = "listBaremetalDhcp", description = "list baremetal dhcp servers", responseObject = BaremetalDhcpResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListBaremetalDhcpCmd extends BaseListCmd {
private static final Logger s_logger = Logger.getLogger(ListBaremetalDhcpCmd.class);
private static final String s_name = "listbaremetaldhcpresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java
index 437fa3f..1663663 100755
--- a/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java
+++ b/plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
-@APICommand(name = "listBaremetalPxeServers", description = "list baremetal pxe server", responseObject = BaremetalPxeResponse.class)
+@APICommand(name = "listBaremetalPxeServers", description = "list baremetal pxe server", responseObject = BaremetalPxeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListBaremetalPxeServersCmd extends BaseListCmd {
private static final Logger s_logger = Logger.getLogger(ListBaremetalPxeServersCmd.class);
private static final String s_name = "listbaremetalpxeserversresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java b/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java
index c27a363..65bc7be 100755
--- a/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "configureSimulator", description = "configure simulator", responseObject = SuccessResponse.class)
+@APICommand(name = "configureSimulator", description = "configure simulator", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ConfigureSimulatorCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ConfigureSimulatorCmd.class.getName());
private static final String s_name = "configuresimulatorresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java
index 17cd3ab..5cb0b64 100755
--- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java
+++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AddUcsManagerCmd.java
@@ -32,7 +32,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.ucs.manager.UcsManager;
import com.cloud.user.Account;
-@APICommand(name = "addUcsManager", description = "Adds a Ucs manager", responseObject = UcsManagerResponse.class)
+@APICommand(name = "addUcsManager", description = "Adds a Ucs manager", responseObject = UcsManagerResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddUcsManagerCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddUcsManagerCmd.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java
index caea0be..a310037 100755
--- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java
+++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/AssociateUcsProfileToBladeCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.ucs.manager.UcsManager;
import com.cloud.user.Account;
-@APICommand(name = "associateUcsProfileToBlade", description = "associate a profile to a blade", responseObject = UcsBladeResponse.class)
+@APICommand(name = "associateUcsProfileToBlade", description = "associate a profile to a blade", responseObject = UcsBladeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AssociateUcsProfileToBladeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AssociateUcsProfileToBladeCmd.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java
index 566ee30..12dd6a0 100644
--- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java
+++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/DeleteUcsManagerCmd.java
@@ -32,7 +32,8 @@ import com.cloud.ucs.manager.UcsManager;
import com.cloud.user.Account;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteUcsManager", description = "Delete a Ucs manager", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteUcsManager", description = "Delete a Ucs manager", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteUcsManagerCmd extends BaseCmd {
private static final Logger logger = Logger.getLogger(DeleteUcsManagerCmd.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java
index 41c7cc1..b48ba01 100755
--- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java
+++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsBladeCmd.java
@@ -32,7 +32,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.ucs.manager.UcsManager;
import com.cloud.user.Account;
-@APICommand(name = "listUcsBlades", description = "List ucs blades", responseObject = UcsBladeResponse.class)
+@APICommand(name = "listUcsBlades", description = "List ucs blades", responseObject = UcsBladeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListUcsBladeCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListUcsBladeCmd.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java
index 767682f..1af0391 100755
--- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java
+++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsManagerCmd.java
@@ -41,7 +41,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.ucs.manager.UcsManager;
import com.cloud.user.Account;
-@APICommand(name = "listUcsManagers", description = "List ucs manager", responseObject = UcsManagerResponse.class)
+@APICommand(name = "listUcsManagers", description = "List ucs manager", responseObject = UcsManagerResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListUcsManagerCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListUcsManagerCmd.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java
index cc49cef..b52cb77 100755
--- a/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java
+++ b/plugins/hypervisors/ucs/src/org/apache/cloudstack/api/ListUcsProfileCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.ucs.manager.UcsManager;
import com.cloud.user.Account;
-@APICommand(name = "listUcsProfiles", description = "List profile in ucs manager", responseObject = UcsProfileResponse.class)
+@APICommand(name = "listUcsProfiles", description = "List profile in ucs manager", responseObject = UcsProfileResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListUcsProfileCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListUcsProfileCmd.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java
index 9e19719..2e0e08e 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java
@@ -38,7 +38,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.element.CiscoNexusVSMElementService;
import com.cloud.user.Account;
-@APICommand(name = "deleteCiscoNexusVSM", responseObject = SuccessResponse.class, description = " delete a Cisco Nexus VSM device")
+@APICommand(name = "deleteCiscoNexusVSM", responseObject = SuccessResponse.class, description = " delete a Cisco Nexus VSM device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteCiscoNexusVSMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteCiscoNexusVSMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java
index 0e4d306..3c246de 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/DisableCiscoNexusVSMCmd.java
@@ -38,7 +38,8 @@ import com.cloud.network.CiscoNexusVSMDevice;
import com.cloud.network.element.CiscoNexusVSMElementService;
import com.cloud.user.Account;
-@APICommand(name = "disableCiscoNexusVSM", responseObject = CiscoNexusVSMResponse.class, description = "disable a Cisco Nexus VSM device")
+@APICommand(name = "disableCiscoNexusVSM", responseObject = CiscoNexusVSMResponse.class, description = "disable a Cisco Nexus VSM device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DisableCiscoNexusVSMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DisableCiscoNexusVSMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java
index 63c79fb..85e4584 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/EnableCiscoNexusVSMCmd.java
@@ -38,7 +38,8 @@ import com.cloud.network.CiscoNexusVSMDevice;
import com.cloud.network.element.CiscoNexusVSMElementService;
import com.cloud.user.Account;
-@APICommand(name = "enableCiscoNexusVSM", responseObject = CiscoNexusVSMResponse.class, description = "Enable a Cisco Nexus VSM device")
+@APICommand(name = "enableCiscoNexusVSM", responseObject = CiscoNexusVSMResponse.class, description = "Enable a Cisco Nexus VSM device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class EnableCiscoNexusVSMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(EnableCiscoNexusVSMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java
index 381bfc9..f6604b4 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java
@@ -45,7 +45,8 @@ import com.cloud.user.Account;
@APICommand(name = "listCiscoNexusVSMs",
responseObject = CiscoNexusVSMResponse.class,
- description = "Retrieves a Cisco Nexus 1000v Virtual Switch Manager device associated with a Cluster")
+ description = "Retrieves a Cisco Nexus 1000v Virtual Switch Manager device associated with a Cluster",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListCiscoNexusVSMsCmd extends BaseListCmd {
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java
index 8a8f98a..7241b96 100644
--- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java
+++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java
@@ -37,7 +37,8 @@ import com.cloud.hypervisor.vmware.VmwareDatacenterVO;
import com.cloud.user.Account;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addVmwareDc", description = "Adds a VMware datacenter to specified zone", responseObject = VmwareDatacenterResponse.class)
+@APICommand(name = "addVmwareDc", description = "Adds a VMware datacenter to specified zone", responseObject = VmwareDatacenterResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class AddVmwareDcCmd extends BaseCmd {
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java
index 9fbf09a..271bc90 100644
--- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java
+++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcsCmd.java
@@ -43,7 +43,8 @@ import com.cloud.hypervisor.vmware.VmwareDatacenter;
import com.cloud.hypervisor.vmware.VmwareDatacenterService;
import com.cloud.user.Account;
-@APICommand(name = "listVmwareDcs", responseObject = VmwareDatacenterResponse.class, description = "Retrieves VMware DC(s) associated with a zone.")
+@APICommand(name = "listVmwareDcs", responseObject = VmwareDatacenterResponse.class, description = "Retrieves VMware DC(s) associated with a zone.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVmwareDcsCmd extends BaseListCmd {
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java
index 6314139..acc0adc 100644
--- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java
+++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java
@@ -35,7 +35,8 @@ import com.cloud.hypervisor.vmware.VmwareDatacenterService;
import com.cloud.user.Account;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "removeVmwareDc", responseObject = SuccessResponse.class, description = "Remove a VMware datacenter from a zone.")
+@APICommand(name = "removeVmwareDc", responseObject = SuccessResponse.class, description = "Remove a VMware datacenter from a zone.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RemoveVmwareDcCmd extends BaseCmd {
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/AddBigSwitchVnsDeviceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/AddBigSwitchVnsDeviceCmd.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/AddBigSwitchVnsDeviceCmd.java
index a30059d..5c6f555 100644
--- a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/AddBigSwitchVnsDeviceCmd.java
+++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/AddBigSwitchVnsDeviceCmd.java
@@ -37,7 +37,8 @@ import com.cloud.network.BigSwitchVnsDeviceVO;
import com.cloud.network.element.BigSwitchVnsElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addBigSwitchVnsDevice", responseObject = BigSwitchVnsDeviceResponse.class, description = "Adds a BigSwitch VNS device", since = "4.1.0")
+@APICommand(name = "addBigSwitchVnsDevice", responseObject = BigSwitchVnsDeviceResponse.class, description = "Adds a BigSwitch VNS device", since = "4.1.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddBigSwitchVnsDeviceCmd extends BaseAsyncCmd {
private static final String s_name = "addbigswitchvnsdeviceresponse";
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/DeleteBigSwitchVnsDeviceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/DeleteBigSwitchVnsDeviceCmd.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/DeleteBigSwitchVnsDeviceCmd.java
index 4af45b2..1e2155d 100644
--- a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/DeleteBigSwitchVnsDeviceCmd.java
+++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/DeleteBigSwitchVnsDeviceCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.element.BigSwitchVnsElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteBigSwitchVnsDevice", responseObject = SuccessResponse.class, description = " delete a bigswitch vns device", since = "4.1.0")
+@APICommand(name = "deleteBigSwitchVnsDevice", responseObject = SuccessResponse.class, description = " delete a bigswitch vns device", since = "4.1.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteBigSwitchVnsDeviceCmd extends BaseAsyncCmd {
private static final String s_name = "deletebigswitchvnsdeviceresponse";
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/ListBigSwitchVnsDevicesCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/ListBigSwitchVnsDevicesCmd.java b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/ListBigSwitchVnsDevicesCmd.java
index 6e4ee75..4cde78e 100644
--- a/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/ListBigSwitchVnsDevicesCmd.java
+++ b/plugins/network-elements/bigswitch-vns/src/com/cloud/api/commands/ListBigSwitchVnsDevicesCmd.java
@@ -42,7 +42,8 @@ import com.cloud.network.BigSwitchVnsDeviceVO;
import com.cloud.network.element.BigSwitchVnsElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listBigSwitchVnsDevices", responseObject = BigSwitchVnsDeviceResponse.class, description = "Lists BigSwitch Vns devices", since = "4.1.0")
+@APICommand(name = "listBigSwitchVnsDevices", responseObject = BigSwitchVnsDeviceResponse.class, description = "Lists BigSwitch Vns devices", since = "4.1.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListBigSwitchVnsDevicesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListBigSwitchVnsDevicesCmd.class.getName());
private static final String s_name = "listbigswitchvnsdeviceresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java
index c7e7d30..5c912a2 100755
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java
@@ -40,7 +40,8 @@ import com.cloud.network.cisco.CiscoAsa1000vDevice;
import com.cloud.network.element.CiscoAsa1000vService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addCiscoAsa1000vResource", responseObject = CiscoAsa1000vResourceResponse.class, description = "Adds a Cisco Asa 1000v appliance")
+@APICommand(name = "addCiscoAsa1000vResource", responseObject = CiscoAsa1000vResourceResponse.class, description = "Adds a Cisco Asa 1000v appliance",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddCiscoAsa1000vResourceCmd extends BaseCmd {
private static final Logger s_logger = Logger.getLogger(AddCiscoAsa1000vResourceCmd.class.getName());
private static final String s_name = "addCiscoAsa1000vResource";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java
index b33d1a8..15d69b6 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java
@@ -39,7 +39,8 @@ import com.cloud.network.cisco.CiscoVnmcController;
import com.cloud.network.element.CiscoVnmcElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addCiscoVnmcResource", responseObject = CiscoVnmcResourceResponse.class, description = "Adds a Cisco Vnmc Controller")
+@APICommand(name = "addCiscoVnmcResource", responseObject = CiscoVnmcResourceResponse.class, description = "Adds a Cisco Vnmc Controller",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddCiscoVnmcResourceCmd extends BaseCmd {
private static final Logger s_logger = Logger.getLogger(AddCiscoVnmcResourceCmd.class.getName());
private static final String s_name = "addCiscoVnmcResource";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java
index 5af7299..cdd4fba 100755
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java
@@ -38,7 +38,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.element.CiscoAsa1000vService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteCiscoAsa1000vResource", responseObject = SuccessResponse.class, description = "Deletes a Cisco ASA 1000v appliance")
+@APICommand(name = "deleteCiscoAsa1000vResource", responseObject = SuccessResponse.class, description = "Deletes a Cisco ASA 1000v appliance",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteCiscoAsa1000vResourceCmd extends BaseCmd {
private static final Logger s_logger = Logger.getLogger(DeleteCiscoAsa1000vResourceCmd.class.getName());
private static final String s_name = "deleteCiscoAsa1000vResource";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java
index ee13ae6..2f1aeca 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java
@@ -38,7 +38,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.element.CiscoVnmcElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteCiscoVnmcResource", responseObject = SuccessResponse.class, description = "Deletes a Cisco Vnmc controller")
+@APICommand(name = "deleteCiscoVnmcResource", responseObject = SuccessResponse.class, description = "Deletes a Cisco Vnmc controller",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteCiscoVnmcResourceCmd extends BaseCmd {
private static final Logger s_logger = Logger.getLogger(DeleteCiscoVnmcResourceCmd.class.getName());
private static final String s_name = "deleteCiscoVnmcResource";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java
index 72898ae..abf0bea 100755
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java
@@ -43,7 +43,8 @@ import com.cloud.network.cisco.CiscoAsa1000vDeviceVO;
import com.cloud.network.element.CiscoAsa1000vService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listCiscoAsa1000vResources", responseObject = CiscoAsa1000vResourceResponse.class, description = "Lists Cisco ASA 1000v appliances")
+@APICommand(name = "listCiscoAsa1000vResources", responseObject = CiscoAsa1000vResourceResponse.class, description = "Lists Cisco ASA 1000v appliances",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListCiscoAsa1000vResourcesCmd extends BaseListCmd {
private static final Logger s_logger = Logger.getLogger(ListCiscoAsa1000vResourcesCmd.class.getName());
private static final String s_name = "listCiscoAsa1000vResources";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java
index 4b0a6b5..c5e05e8 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java
@@ -43,7 +43,8 @@ import com.cloud.network.cisco.CiscoVnmcControllerVO;
import com.cloud.network.element.CiscoVnmcElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listCiscoVnmcResources", responseObject = CiscoVnmcResourceResponse.class, description = "Lists Cisco VNMC controllers")
+@APICommand(name = "listCiscoVnmcResources", responseObject = CiscoVnmcResourceResponse.class, description = "Lists Cisco VNMC controllers",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListCiscoVnmcResourcesCmd extends BaseListCmd {
private static final Logger s_logger = Logger.getLogger(ListCiscoVnmcResourcesCmd.class.getName());
private static final String s_name = "listCiscoVnmcResources";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java
index ff653e7..6deea10 100644
--- a/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java
+++ b/plugins/network-elements/f5/src/com/cloud/api/commands/AddExternalLoadBalancerCmd.java
@@ -36,7 +36,8 @@ import com.cloud.network.element.F5ExternalLoadBalancerElementService;
import com.cloud.user.Account;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addExternalLoadBalancer", description = "Adds F5 external load balancer appliance.", responseObject = ExternalLoadBalancerResponse.class)
+@APICommand(name = "addExternalLoadBalancer", description = "Adds F5 external load balancer appliance.", responseObject = ExternalLoadBalancerResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
@Deprecated
// API supported only for backward compatibility.
public class AddExternalLoadBalancerCmd extends BaseCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java
index ba98882..951439d 100644
--- a/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java
+++ b/plugins/network-elements/f5/src/com/cloud/api/commands/AddF5LoadBalancerCmd.java
@@ -41,7 +41,8 @@ import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
import com.cloud.network.element.F5ExternalLoadBalancerElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addF5LoadBalancer", responseObject = F5LoadBalancerResponse.class, description = "Adds a F5 BigIP load balancer device")
+@APICommand(name = "addF5LoadBalancer", responseObject = F5LoadBalancerResponse.class, description = "Adds a F5 BigIP load balancer device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddF5LoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddF5LoadBalancerCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java
index dc33984..dc520ff 100644
--- a/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java
+++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java
@@ -40,7 +40,8 @@ import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
import com.cloud.network.element.F5ExternalLoadBalancerElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "configureF5LoadBalancer", responseObject = F5LoadBalancerResponse.class, description = "configures a F5 load balancer device")
+@APICommand(name = "configureF5LoadBalancer", responseObject = F5LoadBalancerResponse.class, description = "configures a F5 load balancer device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ConfigureF5LoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ConfigureF5LoadBalancerCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java
index 63a9041..b695ce4 100644
--- a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java
+++ b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.element.F5ExternalLoadBalancerElementService;
import com.cloud.user.Account;
-@APICommand(name = "deleteExternalLoadBalancer", description = "Deletes a F5 external load balancer appliance added in a zone.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteExternalLoadBalancer", description = "Deletes a F5 external load balancer appliance added in a zone.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@Deprecated
// API supported for backward compatibility.
public class DeleteExternalLoadBalancerCmd extends BaseCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java
index 2bb6c1c..cd60c61 100644
--- a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java
+++ b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java
@@ -40,7 +40,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.element.F5ExternalLoadBalancerElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteF5LoadBalancer", responseObject = SuccessResponse.class, description = " delete a F5 load balancer device")
+@APICommand(name = "deleteF5LoadBalancer", responseObject = SuccessResponse.class, description = " delete a F5 load balancer device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteF5LoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteF5LoadBalancerCmd.class.getName());
private static final String s_name = "deletef5loadbalancerresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java
index 119718c..4ffe85f 100644
--- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java
+++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java
@@ -36,7 +36,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.host.Host;
import com.cloud.network.element.F5ExternalLoadBalancerElementService;
-@APICommand(name = "listExternalLoadBalancers", description = "Lists F5 external load balancer appliances added in a zone.", responseObject = HostResponse.class)
+@APICommand(name = "listExternalLoadBalancers", description = "Lists F5 external load balancer appliances added in a zone.", responseObject = HostResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@Deprecated
// API supported for backward compatibility.
public class ListExternalLoadBalancersCmd extends BaseListCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java
index d671a6b..18fb03b 100644
--- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java
+++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java
@@ -43,7 +43,8 @@ import com.cloud.network.Network;
import com.cloud.network.element.F5ExternalLoadBalancerElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listF5LoadBalancerNetworks", responseObject = NetworkResponse.class, description = "lists network that are using a F5 load balancer device")
+@APICommand(name = "listF5LoadBalancerNetworks", responseObject = NetworkResponse.class, description = "lists network that are using a F5 load balancer device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListF5LoadBalancerNetworksCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListF5LoadBalancerNetworksCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java
index ce8eb20..283a150 100644
--- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java
+++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java
@@ -43,7 +43,8 @@ import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
import com.cloud.network.element.F5ExternalLoadBalancerElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listF5LoadBalancers", responseObject = F5LoadBalancerResponse.class, description = "lists F5 load balancer devices")
+@APICommand(name = "listF5LoadBalancers", responseObject = F5LoadBalancerResponse.class, description = "lists F5 load balancer devices",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListF5LoadBalancersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListF5LoadBalancersCmd.class.getName());
private static final String s_name = "listf5loadbalancerresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
index 50457d8..86e2949 100644
--- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
+++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
@@ -51,7 +51,9 @@ import com.cloud.user.Account;
@APICommand(name = "createServiceInstance",
description = "Creates a system virtual-machine that implements network services",
- responseObject = ServiceInstanceResponse.class)
+ responseObject = ServiceInstanceResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd {
private static final String s_name = "createserviceinstanceresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java
index 96e9bc0..89fc17d 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddExternalFirewallCmd.java
@@ -35,7 +35,8 @@ import com.cloud.network.element.JuniperSRXFirewallElementService;
import com.cloud.user.Account;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addExternalFirewall", description = "Adds an external firewall appliance", responseObject = ExternalFirewallResponse.class)
+@APICommand(name = "addExternalFirewall", description = "Adds an external firewall appliance", responseObject = ExternalFirewallResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class AddExternalFirewallCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddExternalFirewallCmd.class.getName());
private static final String s_name = "addexternalfirewallresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java
index 53e7bfc..59bf17c 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/AddSrxFirewallCmd.java
@@ -40,7 +40,8 @@ import com.cloud.network.dao.ExternalFirewallDeviceVO;
import com.cloud.network.element.JuniperSRXFirewallElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addSrxFirewall", responseObject = SrxFirewallResponse.class, description = "Adds a SRX firewall device")
+@APICommand(name = "addSrxFirewall", responseObject = SrxFirewallResponse.class, description = "Adds a SRX firewall device",
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class AddSrxFirewallCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddSrxFirewallCmd.class.getName());
private static final String s_name = "addsrxfirewallresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java
index 303e987..4829686 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ConfigureSrxFirewallCmd.java
@@ -39,7 +39,8 @@ import com.cloud.network.dao.ExternalFirewallDeviceVO;
import com.cloud.network.element.JuniperSRXFirewallElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "configureSrxFirewall", responseObject = SrxFirewallResponse.class, description = "Configures a SRX firewall device")
+@APICommand(name = "configureSrxFirewall", responseObject = SrxFirewallResponse.class, description = "Configures a SRX firewall device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ConfigureSrxFirewallCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ConfigureSrxFirewallCmd.class.getName());
[39/50] [abbrv] - Updated APICommand annotation to add new flags that
indicate if API request or response carry sensitive info - Updated all API
classes with the new annotation flag values as per the API's sensitivity -
Updated server code to check respo
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
index 50be6ba..3d1a773 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.StoragePoolResponse;
import com.cloud.storage.StoragePool;
import com.cloud.user.Account;
-@APICommand(name = "updateStoragePool", description = "Updates a storage pool.", responseObject = StoragePoolResponse.class, since = "3.0.0")
+@APICommand(name = "updateStoragePool", description = "Updates a storage pool.", responseObject = StoragePoolResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateStoragePoolCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateStoragePoolCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java b/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
index 173c95e..19a8425 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.DiscoveryException;
import com.cloud.storage.ImageStore;
import com.cloud.user.Account;
-@APICommand(name = "addSwift", description = "Adds Swift.", responseObject = ImageStoreResponse.class, since = "3.0.0")
+@APICommand(name = "addSwift", description = "Adds Swift.", responseObject = ImageStoreResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddSwiftCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddSwiftCmd.class.getName());
private static final String s_name = "addswiftresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
index fcc8e46..f80cfab 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
@@ -28,7 +28,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.user.Account;
-@APICommand(name = "listSwifts", description = "List Swift.", responseObject = ImageStoreResponse.class, since = "3.0.0")
+@APICommand(name = "listSwifts", description = "List Swift.", responseObject = ImageStoreResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSwiftsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListSwiftsCmd.class.getName());
private static final String s_name = "listswiftsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
index 07e111c..2b25a0f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
-@APICommand(name = "destroySystemVm", responseObject = SystemVmResponse.class, description = "Destroyes a system virtual machine.")
+@APICommand(name = "destroySystemVm", responseObject = SystemVmResponse.class, description = "Destroyes a system virtual machine.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DestroySystemVmCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DestroySystemVmCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
index 9480497..e5feec2 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
@@ -36,7 +36,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.utils.Pair;
import com.cloud.vm.VirtualMachine;
-@APICommand(name = "listSystemVms", description = "List system virtual machines.", responseObject = SystemVmResponse.class)
+@APICommand(name = "listSystemVms", description = "List system virtual machines.", responseObject = SystemVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSystemVMsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListSystemVMsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
index 8199e68..0da7a53 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
@@ -38,7 +38,8 @@ import com.cloud.host.Host;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
-@APICommand(name = "migrateSystemVm", description = "Attempts Migration of a system virtual machine to the host specified.", responseObject = SystemVmResponse.class)
+@APICommand(name = "migrateSystemVm", description = "Attempts Migration of a system virtual machine to the host specified.", responseObject = SystemVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class MigrateSystemVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(MigrateSystemVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
index 1c38b05..6663d64 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
-@APICommand(name = "rebootSystemVm", description = "Reboots a system VM.", responseObject = SystemVmResponse.class)
+@APICommand(name = "rebootSystemVm", description = "Reboots a system VM.", responseObject = SystemVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RebootSystemVmCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RebootSystemVmCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
index 370815d..3df6497 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
@@ -44,7 +44,8 @@ import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "scaleSystemVm", responseObject = SystemVmResponse.class, description = "Scale the service offering for a system vm (console proxy or secondary storage). "
- + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.")
+ + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ScaleSystemVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
private static final String s_name = "changeserviceforsystemvmresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
index 2e65928..925c9cf 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
-@APICommand(name = "startSystemVm", responseObject = SystemVmResponse.class, description = "Starts a system virtual machine.")
+@APICommand(name = "startSystemVm", responseObject = SystemVmResponse.class, description = "Starts a system virtual machine.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class StartSystemVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(StartSystemVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
index 7709ebe..ef58156 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
-@APICommand(name = "stopSystemVm", description = "Stops a system VM.", responseObject = SystemVmResponse.class)
+@APICommand(name = "stopSystemVm", description = "Stops a system VM.", responseObject = SystemVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class StopSystemVmCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(StopSystemVmCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
index da0564e..7aff825 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
@@ -38,8 +38,9 @@ import com.cloud.offering.ServiceOffering;
import com.cloud.user.Account;
import com.cloud.vm.VirtualMachine;
-@APICommand(name = "changeServiceForSystemVm", responseObject = SystemVmResponse.class, description = "Changes the service offering for a system vm (console proxy or secondary storage). "
- + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.")
+ @APICommand(name = "changeServiceForSystemVm", responseObject = SystemVmResponse.class, description = "Changes the service offering for a system vm (console proxy or secondary storage). "
+ + "The system vm must be in a \"Stopped\" state for " + "this command to take effect.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpgradeSystemVMCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
private static final String s_name = "changeserviceforsystemvmresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
index 16761ba..d227232 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-@APICommand(name = "prepareTemplate", responseObject = TemplateResponse.class, description = "load template into primary storage")
+@APICommand(name = "prepareTemplate", responseObject = TemplateResponse.class, description = "load template into primary storage",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class PrepareTemplateCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(PrepareTemplateCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
index 031fc8d..e0d7555 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
@@ -32,7 +32,8 @@ import com.cloud.host.Host;
import com.cloud.user.Account;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addTrafficMonitor", description = "Adds Traffic Monitor Host for Direct Network Usage", responseObject = TrafficMonitorResponse.class)
+@APICommand(name = "addTrafficMonitor", description = "Adds Traffic Monitor Host for Direct Network Usage", responseObject = TrafficMonitorResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddTrafficMonitorCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddTrafficMonitorCmd.class.getName());
private static final String s_name = "addtrafficmonitorresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
index 0fcb8f8..a71d5bb 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.PhysicalNetworkTrafficType;
import com.cloud.user.Account;
-@APICommand(name = "addTrafficType", description = "Adds traffic type to a physical network", responseObject = TrafficTypeResponse.class, since = "3.0.0")
+@APICommand(name = "addTrafficType", description = "Adds traffic type to a physical network", responseObject = TrafficTypeResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(AddTrafficTypeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
index debaf00..4c2bac2 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
-@APICommand(name = "deleteTrafficMonitor", description = "Deletes an traffic monitor host.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteTrafficMonitor", description = "Deletes an traffic monitor host.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteTrafficMonitorCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteTrafficMonitorCmd.class.getName());
private static final String s_name = "deletetrafficmonitorresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
index 111e177..46383cc 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.TrafficTypeResponse;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "deleteTrafficType", description = "Deletes traffic type of a physical network", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "deleteTrafficType", description = "Deletes traffic type of a physical network", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteTrafficTypeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteTrafficTypeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
index 4fc36ab..184f88a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
@@ -33,7 +33,9 @@ import com.cloud.user.Account;
@APICommand(name = "generateUsageRecords",
description = "Generates usage records. This will generate records only if there any records to be generated, i.e if the scheduled usage job was not run or failed",
- responseObject = SuccessResponse.class)
+ responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class GenerateUsageRecordsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(GenerateUsageRecordsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
index a8bd1e5..21a7e4a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/GetUsageRecordsCmd.java
@@ -35,7 +35,8 @@ import org.apache.cloudstack.usage.Usage;
import com.cloud.utils.Pair;
-@APICommand(name = "listUsageRecords", description = "Lists usage records for accounts", responseObject = UsageRecordResponse.class)
+@APICommand(name = "listUsageRecords", description = "Lists usage records for accounts", responseObject = UsageRecordResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class GetUsageRecordsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(GetUsageRecordsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
index 3592539..4c39863 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.host.Host;
-@APICommand(name = "listTrafficMonitors", description = "List traffic monitor Hosts.", responseObject = TrafficMonitorResponse.class)
+@APICommand(name = "listTrafficMonitors", description = "List traffic monitor Hosts.", responseObject = TrafficMonitorResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListTrafficMonitorsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName());
private static final String s_name = "listtrafficmonitorsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
index 159608e..a1ff29f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
@@ -40,7 +40,9 @@ import com.cloud.utils.Pair;
@APICommand(name = "listTrafficTypeImplementors",
description = "Lists implementors of implementor of a network traffic type or implementors of all network traffic types",
responseObject = TrafficTypeImplementorResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListTrafficTypeImplementorsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListTrafficTypeImplementorsCmd.class);
private static final String Name = "listtraffictypeimplementorsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
index 47ba781..33ee296 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
@@ -34,7 +34,8 @@ import com.cloud.network.PhysicalNetworkTrafficType;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
-@APICommand(name = "listTrafficTypes", description = "Lists traffic types of a given physical network.", responseObject = ProviderResponse.class, since = "3.0.0")
+@APICommand(name = "listTrafficTypes", description = "Lists traffic types of a given physical network.", responseObject = ProviderResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListTrafficTypesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListTrafficTypesCmd.class.getName());
private static final String Name = "listtraffictypesresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
index b5e445b..2c5a786 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
@@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.UsageTypeResponse;
import com.cloud.user.Account;
-@APICommand(name = "listUsageTypes", description = "List Usage Types", responseObject = UsageTypeResponse.class)
+@APICommand(name = "listUsageTypes", description = "List Usage Types", responseObject = UsageTypeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListUsageTypesCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ListUsageTypesCmd.class.getName());
private static final String s_name = "listusagetypesresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
index 2ad470e..3de8905 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
@@ -31,7 +31,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.PhysicalNetworkTrafficType;
import com.cloud.user.Account;
-@APICommand(name = "updateTrafficType", description = "Updates traffic type of a physical network", responseObject = TrafficTypeResponse.class, since = "3.0.0")
+@APICommand(name = "updateTrafficType", description = "Updates traffic type of a physical network", responseObject = TrafficTypeResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateTrafficTypeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
index 03512db..34feb49 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
import com.cloud.user.User;
-@APICommand(name = "createUser", description = "Creates a user for an account that already exists", responseObject = UserResponse.class)
+@APICommand(name = "createUser", description = "Creates a user for an account that already exists", responseObject = UserResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = true)
public class CreateUserCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateUserCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
index 6ba382a..08ba521 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.region.RegionService;
import com.cloud.user.Account;
import com.cloud.user.User;
-@APICommand(name = "deleteUser", description = "Deletes a user for an account", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteUser", description = "Deletes a user for an account", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteUserCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteUserCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
index 599328d..c6e09ef 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
@@ -36,7 +36,8 @@ import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.user.UserAccount;
-@APICommand(name = "disableUser", description = "Disables a user account", responseObject = UserResponse.class)
+@APICommand(name = "disableUser", description = "Disables a user account", responseObject = UserResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class DisableUserCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DisableUserCmd.class.getName());
private static final String s_name = "disableuserresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
index 8d37eda..d69eccf 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
@@ -34,7 +34,8 @@ import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.user.UserAccount;
-@APICommand(name = "enableUser", description = "Enables a user account", responseObject = UserResponse.class)
+@APICommand(name = "enableUser", description = "Enables a user account", responseObject = UserResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class EnableUserCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(EnableUserCmd.class.getName());
private static final String s_name = "enableuserresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
index 592b828..b2c6734 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
@@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.UserResponse;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.UserAccount;
-@APICommand(name = "getUser", description = "Find user account by API key", responseObject = UserResponse.class)
+@APICommand(name = "getUser", description = "Find user account by API key", responseObject = UserResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class GetUserCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(GetUserCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
index 41d6acd..c0c2b24 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
@@ -25,7 +25,8 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserResponse;
-@APICommand(name = "listUsers", description = "Lists user accounts", responseObject = UserResponse.class)
+@APICommand(name = "listUsers", description = "Lists user accounts", responseObject = UserResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class ListUsersCmd extends BaseListAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListUsersCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
index 9533004..69623d0 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
@@ -30,7 +30,8 @@ import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.user.UserAccount;
-@APICommand(name = "lockUser", description = "Locks a user account", responseObject = UserResponse.class)
+@APICommand(name = "lockUser", description = "Locks a user account", responseObject = UserResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class LockUserCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(LockUserCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
index facdc87..2090d21 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
@@ -30,7 +30,8 @@ import com.cloud.user.User;
@APICommand(name = "registerUserKeys",
responseObject = RegisterResponse.class,
- description = "This command allows a user to register for the developer API, returning a secret key and an API key. This request is made through the integration API port, so it is a privileged command and must be made on behalf of a user. It is up to the implementer just how the username and password are entered, and then how that translates to an integration API request. Both secret key and API key should be returned to the user")
+ description = "This command allows a user to register for the developer API, returning a secret key and an API key. This request is made through the integration API port, so it is a privileged command and must be made on behalf of a user. It is up to the implementer just how the username and password are entered, and then how that translates to an integration API request. Both secret key and API key should be returned to the user",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class RegisterCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(RegisterCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
index de6e550..cf5d355 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
@@ -34,7 +34,8 @@ import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.user.UserAccount;
-@APICommand(name = "updateUser", description = "Updates a user account", responseObject = UserResponse.class)
+@APICommand(name = "updateUser", description = "Updates a user account", responseObject = UserResponse.class,
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = true)
public class UpdateUserCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateUserCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
index cd3dd7e..75edfce 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
@@ -39,7 +39,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "createVlanIpRange", description = "Creates a VLAN IP range.", responseObject = VlanIpRangeResponse.class)
+@APICommand(name = "createVlanIpRange", description = "Creates a VLAN IP range.", responseObject = VlanIpRangeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVlanIpRangeCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateVlanIpRangeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
index 2650482..2cba8e6 100755
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "dedicatePublicIpRange", description = "Dedicates a Public IP range to an account", responseObject = VlanIpRangeResponse.class)
+@APICommand(name = "dedicatePublicIpRange", description = "Dedicates a Public IP range to an account", responseObject = VlanIpRangeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DedicatePublicIpRangeCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DedicatePublicIpRangeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
index 8d29130..af32fc4 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.VlanIpRangeResponse;
import com.cloud.user.Account;
-@APICommand(name = "deleteVlanIpRange", description = "Creates a VLAN IP range.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteVlanIpRange", description = "Creates a VLAN IP range.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteVlanIpRangeCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVlanIpRangeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
index 9d6eae6..d4f2d5a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
@@ -37,7 +37,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.dc.Vlan;
import com.cloud.utils.Pair;
-@APICommand(name = "listVlanIpRanges", description = "Lists all VLAN IP ranges.", responseObject = VlanIpRangeResponse.class)
+@APICommand(name = "listVlanIpRanges", description = "Lists all VLAN IP ranges.", responseObject = VlanIpRangeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVlanIpRangesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListVlanIpRangesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
index 2c160be..15cfbc6 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.VlanIpRangeResponse;
import com.cloud.user.Account;
-@APICommand(name = "releasePublicIpRange", description = "Releases a Public IP range back to the system pool", responseObject = SuccessResponse.class)
+@APICommand(name = "releasePublicIpRange", description = "Releases a Public IP range back to the system pool", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReleasePublicIpRangeCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ReleasePublicIpRangeCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
index c9b5c9f..f435f72 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
@@ -37,7 +37,9 @@ import com.cloud.uservm.UserVm;
@APICommand(name = "assignVirtualMachine",
description = "Change ownership of a VM from one account to another. This API is available for Basic zones with security groups and Advanced zones with guest networks. A root administrator can reassign a VM from any account to any other account in any domain. A domain administrator can reassign a VM to any account in the same domain.",
responseObject = UserVmResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
public class AssignVMCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AssignVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
index 7b16686..983d25d 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
@@ -37,7 +37,8 @@ import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "expungeVirtualMachine", description = "Expunge a virtual machine. Once expunged, it cannot be recoverd.", responseObject = SuccessResponse.class)
+@APICommand(name = "expungeVirtualMachine", description = "Expunge a virtual machine. Once expunged, it cannot be recoverd.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ExpungeVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ExpungeVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
index 0e52714..bf39f99 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
@@ -29,7 +29,8 @@ import org.apache.log4j.Logger;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "getVirtualMachineUserData", description = "Returns user data associated with the VM", responseObject = VMUserDataResponse.class, since = "4.4")
+@APICommand(name = "getVirtualMachineUserData", description = "Returns user data associated with the VM", responseObject = VMUserDataResponse.class, since = "4.4",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class GetVMUserDataCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(GetVMUserDataCmd.class);
private static final String s_name = "getvirtualmachineuserdataresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
index 3706d50..611f698 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
@@ -43,7 +43,9 @@ import com.cloud.vm.VirtualMachine;
@APICommand(name = "migrateVirtualMachine",
description = "Attempts Migration of a VM to a different host or Root volume of the vm to a different storage pool",
- responseObject = UserVmResponse.class)
+ responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
public class MigrateVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(MigrateVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
index 90918bf..7b10239 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
@@ -45,7 +45,9 @@ import com.cloud.vm.VirtualMachine;
@APICommand(name = "migrateVirtualMachineWithVolume",
description = "Attempts Migration of a VM with its volumes to a different host",
- responseObject = UserVmResponse.class)
+ responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(MigrateVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
index abf5168..05d7a98 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
@@ -30,7 +30,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "recoverVirtualMachine", description = "Recovers a virtual machine.", responseObject = UserVmResponse.class)
+@APICommand(name = "recoverVirtualMachine", description = "Recovers a virtual machine.", responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class RecoverVMCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(RecoverVMCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
index c3201f1..e13ed5b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
@@ -42,7 +42,8 @@ import com.cloud.network.vpc.PrivateGateway;
import com.cloud.network.vpc.Vpc;
import com.cloud.user.Account;
-@APICommand(name = "createPrivateGateway", description = "Creates a private gateway", responseObject = PrivateGatewayResponse.class)
+@APICommand(name = "createPrivateGateway", description = "Creates a private gateway", responseObject = PrivateGatewayResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreatePrivateGatewayCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreatePrivateGatewayCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
index 96d5c6a..6b2c4ba 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
@@ -39,7 +39,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.vpc.VpcOffering;
import com.cloud.user.Account;
-@APICommand(name = "createVPCOffering", description = "Creates VPC offering", responseObject = VpcOfferingResponse.class)
+@APICommand(name = "createVPCOffering", description = "Creates VPC offering", responseObject = VpcOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateVPCOfferingCmd.class.getName());
private static final String Name = "createvpcofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
index a5bb00c..833044f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.VpcGateway;
import com.cloud.user.Account;
-@APICommand(name = "deletePrivateGateway", description = "Deletes a Private gateway", responseObject = SuccessResponse.class)
+@APICommand(name = "deletePrivateGateway", description = "Deletes a Private gateway", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeletePrivateGatewayCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeletePrivateGatewayCmd.class.getName());
private static final String s_name = "deleteprivategatewayresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
index 7abaa7d..0959f5f 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.VpcOfferingResponse;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "deleteVPCOffering", description = "Deletes VPC offering", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteVPCOffering", description = "Deletes VPC offering", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteVPCOfferingCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteVPCOfferingCmd.class.getName());
private static final String s_name = "deletevpcofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
index 3526b4b..8b05a7a 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
@@ -30,7 +30,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.vpc.VpcOffering;
import com.cloud.user.Account;
-@APICommand(name = "updateVPCOffering", description = "Updates VPC offering", responseObject = VpcOfferingResponse.class)
+@APICommand(name = "updateVPCOffering", description = "Updates VPC offering", responseObject = VpcOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateVPCOfferingCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVPCOfferingCmd.class.getName());
private static final String Name = "updatevpcofferingresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
index 0846102..b880ab8 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.dc.DataCenter;
import com.cloud.user.Account;
-@APICommand(name = "createZone", description = "Creates a Zone.", responseObject = ZoneResponse.class)
+@APICommand(name = "createZone", description = "Creates a Zone.", responseObject = ZoneResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateZoneCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateZoneCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
index 3e74625..c7029b0 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
-@APICommand(name = "deleteZone", description = "Deletes a Zone.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteZone", description = "Deletes a Zone.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteZoneCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteZoneCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
index fe2bc6a..4e6b786 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "markDefaultZoneForAccount", description = "Marks a default zone for this account", responseObject = AccountResponse.class, since = "4.0")
+@APICommand(name = "markDefaultZoneForAccount", description = "Marks a default zone for this account", responseObject = AccountResponse.class, since = "4.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class MarkDefaultZoneForAccountCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(MarkDefaultZoneForAccountCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
index f0074c5..090bc4e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.dc.DataCenter;
import com.cloud.user.Account;
-@APICommand(name = "updateZone", description = "Updates a Zone.", responseObject = ZoneResponse.class)
+@APICommand(name = "updateZone", description = "Updates a Zone.", responseObject = ZoneResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateZoneCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateZoneCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
index 36df579..ef36038 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
-@APICommand(name = "addAccountToProject", description = "Adds acoount to a project", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "addAccountToProject", description = "Adds acoount to a project", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddAccountToProjectCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddAccountToProjectCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
index f6aa36c..5c89173 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
-@APICommand(name = "deleteAccountFromProject", description = "Deletes account from the project", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "deleteAccountFromProject", description = "Deletes account from the project", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteAccountFromProjectCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteProjectCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
index bc93d21..f3632c0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
@@ -25,7 +25,8 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.ListResponse;
-@APICommand(name = "listAccounts", description = "Lists accounts and provides detailed account information for listed accounts", responseObject = AccountResponse.class)
+@APICommand(name = "listAccounts", description = "Lists accounts and provides detailed account information for listed accounts",
+ responseObject = AccountResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class ListAccountsCmd extends BaseListDomainResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListAccountsCmd.class.getName());
private static final String s_name = "listaccountsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
index aa60016..a70024e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
@@ -28,7 +28,8 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import com.cloud.user.Account;
-@APICommand(name = "listProjectAccounts", description = "Lists project's accounts", responseObject = ProjectResponse.class, since = "3.0.0")
+@APICommand(name = "listProjectAccounts", description = "Lists project's accounts", responseObject = ProjectResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListProjectAccountsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListProjectAccountsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
index ed01c60..aca9bfc 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
@@ -55,7 +55,8 @@ import com.cloud.offering.NetworkOffering;
import com.cloud.projects.Project;
import com.cloud.user.Account;
-@APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class)
+@APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(AssociateIPAddrCmd.class.getName());
private static final String s_name = "associateipaddressresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
index e3669be..269fcb5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.IpAddress;
import com.cloud.user.Account;
-@APICommand(name = "disassociateIpAddress", description = "Disassociates an ip address from the account.", responseObject = SuccessResponse.class)
+@APICommand(name = "disassociateIpAddress", description = "Disassociates an ip address from the account.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DisassociateIPAddrCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DisassociateIPAddrCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
index a5c54ad..1f2b450 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
@@ -37,7 +37,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.network.IpAddress;
import com.cloud.utils.Pair;
-@APICommand(name = "listPublicIpAddresses", description = "Lists all public ip addresses", responseObject = IPAddressResponse.class)
+@APICommand(name = "listPublicIpAddresses", description = "Lists all public ip addresses", responseObject = IPAddressResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListPublicIpAddressesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
index 16dcc4e..c2de3a1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
@@ -36,7 +36,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.IpAddress;
import com.cloud.user.Account;
-@APICommand(name = "updatePublicIpAddress", description = "Updates an ip address", responseObject = IPAddressResponse.class)
+@APICommand(name = "updatePublicIpAddress", description = "Updates an ip address", responseObject = IPAddressResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateIPAddrCmd.class.getName());
private static final String s_name = "updateipaddressresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
index a2542a8..41d5823 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
@@ -34,7 +34,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.user.Account;
-@APICommand(name = "createAffinityGroup", responseObject = AffinityGroupResponse.class, description = "Creates an affinity/anti-affinity group")
+@APICommand(name = "createAffinityGroup", responseObject = AffinityGroupResponse.class, description = "Creates an affinity/anti-affinity group",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateAffinityGroupCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateAffinityGroupCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
index a6cf1bb..d4d1f2a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
@@ -34,7 +34,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
-@APICommand(name = "deleteAffinityGroup", description = "Deletes affinity group", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteAffinityGroup", description = "Deletes affinity group", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteAffinityGroupCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteAffinityGroupCmd.class.getName());
private static final String s_name = "deleteaffinitygroupresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
index 87de7f7..84ad032 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
@@ -28,7 +28,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.user.Account;
-@APICommand(name = "listAffinityGroupTypes", description = "Lists affinity group types available", responseObject = AffinityGroupTypeResponse.class)
+@APICommand(name = "listAffinityGroupTypes", description = "Lists affinity group types available", responseObject = AffinityGroupTypeResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListAffinityGroupTypesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListAffinityGroupTypesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
index 0761a64..9dbf727 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
@@ -26,7 +26,8 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-@APICommand(name = "listAffinityGroups", description = "Lists affinity groups", responseObject = AffinityGroupResponse.class)
+@APICommand(name = "listAffinityGroups", description = "Lists affinity groups", responseObject = AffinityGroupResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListAffinityGroupsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
index 7bb1c5b..0c3f296 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
@@ -45,7 +45,9 @@ import com.cloud.uservm.UserVm;
@APICommand(name = "updateVMAffinityGroup",
description = "Updates the affinity/anti-affinity group associations of a virtual machine. The VM has to be stopped and restarted for the "
+ "new properties to take effect.",
- responseObject = UserVmResponse.class)
+ responseObject = UserVmResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVMAffinityGroupCmd.class.getName());
private static final String s_name = "updatevirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
index ce6dc68..04130b5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java
@@ -39,7 +39,9 @@ import com.cloud.user.Account;
@APICommand(name = "createAutoScalePolicy",
description = "Creates an autoscale policy for a provision or deprovision action, the action is taken when the all the conditions evaluates to true for the specified duration. The policy is in effect once it is attached to a autscale vm group.",
- responseObject = AutoScalePolicyResponse.class)
+ responseObject = AutoScalePolicyResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class CreateAutoScalePolicyCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateAutoScalePolicyCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
index ab6d847..c519219 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
@@ -40,7 +40,9 @@ import com.cloud.network.rules.LoadBalancer;
@APICommand(name = "createAutoScaleVmGroup",
description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.",
- responseObject = AutoScaleVmGroupResponse.class)
+ responseObject = AutoScaleVmGroupResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class CreateAutoScaleVmGroupCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateAutoScaleVmGroupCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
index 06d86ec..570e018 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
@@ -44,7 +44,9 @@ import com.cloud.user.User;
@APICommand(name = "createAutoScaleVmProfile",
description = "Creates a profile that contains information about the virtual machine which will be provisioned automatically by autoscale feature.",
- responseObject = AutoScaleVmProfileResponse.class)
+ responseObject = AutoScaleVmProfileResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
@SuppressWarnings("rawtypes")
public class CreateAutoScaleVmProfileCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateAutoScaleVmProfileCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
index 914848a..356b836 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
@@ -35,7 +35,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.as.Condition;
-@APICommand(name = "createCondition", description = "Creates a condition", responseObject = ConditionResponse.class)
+@APICommand(name = "createCondition", description = "Creates a condition", responseObject = ConditionResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateConditionCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateConditionCmd.class.getName());
private static final String s_name = "conditionresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
index 1aedf57..903ac59 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.user.Account;
-@APICommand(name = "deleteAutoScalePolicy", description = "Deletes a autoscale policy.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteAutoScalePolicy", description = "Deletes a autoscale policy.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteAutoScalePolicyCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteAutoScalePolicyCmd.class.getName());
private static final String s_name = "deleteautoscalepolicyresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
index a7823b4..44f2cd8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.user.Account;
-@APICommand(name = "deleteAutoScaleVmGroup", description = "Deletes a autoscale vm group.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteAutoScaleVmGroup", description = "Deletes a autoscale vm group.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteAutoScaleVmGroupCmd.class.getName());
private static final String s_name = "deleteautoscalevmgroupresponse";
[37/50] [abbrv] - Updated APICommand annotation to add new flags that
indicate if API request or response carry sensitive info - Updated all API
classes with the new annotation flag values as per the API's sensitivity -
Updated server code to check respo
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
index dca1c23..ecb0c44 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
@@ -35,7 +35,8 @@ import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.StaticNatRule;
import com.cloud.utils.Pair;
-@APICommand(name = "listIpForwardingRules", description = "List the ip forwarding rules", responseObject = FirewallRuleResponse.class)
+@APICommand(name = "listIpForwardingRules", description = "List the ip forwarding rules", responseObject = FirewallRuleResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListIpForwardingRulesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
index 151e42f..e47fa8b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
@@ -42,7 +42,9 @@ import com.cloud.utils.net.NetUtils;
@APICommand(name = "createNetworkACL",
description = "Creates a ACL rule in the given network (the network has to belong to VPC)",
- responseObject = NetworkACLItemResponse.class)
+ responseObject = NetworkACLItemResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class CreateNetworkACLCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkACLCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
index 24c3a85..07156cf 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
@@ -34,7 +34,8 @@ import com.cloud.network.vpc.NetworkACL;
import com.cloud.network.vpc.Vpc;
import com.cloud.user.Account;
-@APICommand(name = "createNetworkACLList", description = "Creates a Network ACL for the given VPC", responseObject = NetworkACLResponse.class)
+@APICommand(name = "createNetworkACLList", description = "Creates a Network ACL for the given VPC", responseObject = NetworkACLResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateNetworkACLListCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkACLListCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
index 018f16e..2f9220f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
@@ -42,7 +42,8 @@ import com.cloud.network.Network;
import com.cloud.network.Network.GuestType;
import com.cloud.offering.NetworkOffering;
-@APICommand(name = "createNetwork", description = "Creates a network", responseObject = NetworkResponse.class)
+@APICommand(name = "createNetwork", description = "Creates a network", responseObject = NetworkResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateNetworkCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
index 7413ea5..ecc651d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "deleteNetworkACL", description = "Deletes a Network ACL", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteNetworkACL", description = "Deletes a Network ACL", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkACLCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkACLCmd.class.getName());
private static final String s_name = "deletenetworkaclresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
index 632d710..3b3a4ec 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "deleteNetworkACLList", description = "Deletes a Network ACL", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteNetworkACLList", description = "Deletes a Network ACL", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkACLListCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkACLListCmd.class.getName());
private static final String s_name = "deletenetworkacllistresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
index 808051e..224eec0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.Network;
-@APICommand(name = "deleteNetwork", description = "Deletes a network", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteNetwork", description = "Deletes a network", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkOfferingCmd.class.getName());
private static final String s_name = "deletenetworkresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
index 2e50bb8..c34ea3f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.VpcResponse;
import com.cloud.network.vpc.NetworkACL;
import com.cloud.utils.Pair;
-@APICommand(name = "listNetworkACLLists", description = "Lists all network ACLs", responseObject = NetworkACLResponse.class)
+@APICommand(name = "listNetworkACLLists", description = "Lists all network ACLs", responseObject = NetworkACLResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNetworkACLListsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkACLListsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
index 7f8aef4..41f96d3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import com.cloud.network.vpc.NetworkACLItem;
import com.cloud.utils.Pair;
-@APICommand(name = "listNetworkACLs", description = "Lists all network ACL items", responseObject = NetworkACLItemResponse.class)
+@APICommand(name = "listNetworkACLs", description = "Lists all network ACL items", responseObject = NetworkACLItemResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNetworkACLsCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkACLsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
index 552a64a..a08e28f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.offering.NetworkOffering;
-@APICommand(name = "listNetworkOfferings", description = "Lists all available network offerings.", responseObject = NetworkOfferingResponse.class)
+@APICommand(name = "listNetworkOfferings", description = "Lists all available network offerings.", responseObject = NetworkOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNetworkOfferingsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkOfferingsCmd.class.getName());
private static final String Name = "listnetworkofferingsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
index 111fac3..d94c836 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
@@ -33,7 +33,8 @@ import org.apache.log4j.Logger;
import com.cloud.network.Network;
import com.cloud.utils.Pair;
-@APICommand(name = "listNetworks", description = "Lists all available networks.", responseObject = NetworkResponse.class)
+@APICommand(name = "listNetworks", description = "Lists all available networks.", responseObject = NetworkResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNetworksCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworksCmd.class.getName());
private static final String Name = "listnetworksresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
index de1f163..d005718 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
@@ -34,7 +34,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "replaceNetworkACLList", description = "Replaces ACL associated with a Network or private gateway", responseObject = SuccessResponse.class)
+@APICommand(name = "replaceNetworkACLList", description = "Replaces ACL associated with a Network or private gateway", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReplaceNetworkACLListCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReplaceNetworkACLListCmd.class.getName());
private static final String s_name = "replacenetworkacllistresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
index cd508ff..db7b721 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
@@ -38,7 +38,9 @@ import com.cloud.network.Network;
@APICommand(name = "restartNetwork",
description = "Restarts the network; includes 1) restarting network elements - virtual routers, dhcp servers 2) reapplying all public ips 3) reapplying loadBalancing/portForwarding rules",
- responseObject = IPAddressResponse.class)
+ responseObject = IPAddressResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class RestartNetworkCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RestartNetworkCmd.class.getName());
private static final String s_name = "restartnetworkresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
index 82985d0..eb095df 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.NetworkACLItem;
import com.cloud.user.Account;
-@APICommand(name = "updateNetworkACLItem", description = "Updates ACL Item with specified Id", responseObject = NetworkACLItemResponse.class)
+@APICommand(name = "updateNetworkACLItem", description = "Updates ACL Item with specified Id", responseObject = NetworkACLItemResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkACLItemCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
index 1170e9e..c58f965 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
@@ -31,7 +31,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.NetworkACL;
import com.cloud.user.Account;
-@APICommand(name = "updateNetworkACLList", description = "Updates Network ACL list", responseObject = SuccessResponse.class, since = "4.4")
+@APICommand(name = "updateNetworkACLList", description = "Updates Network ACL list", responseObject = SuccessResponse.class, since = "4.4",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateNetworkACLListCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkACLListCmd.class.getName());
private static final String s_name = "updatenetworkacllistresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
index e327de1..d6eae94 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
@@ -38,7 +38,8 @@ import com.cloud.offering.NetworkOffering;
import com.cloud.user.Account;
import com.cloud.user.User;
-@APICommand(name = "updateNetwork", description = "Updates a network", responseObject = NetworkResponse.class)
+@APICommand(name = "updateNetwork", description = "Updates a network", responseObject = NetworkResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateNetworkCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
index 954b64e..0e4806a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java
@@ -26,7 +26,8 @@ import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
-@APICommand(name = "listDiskOfferings", description = "Lists all available disk offerings.", responseObject = DiskOfferingResponse.class)
+@APICommand(name = "listDiskOfferings", description = "Lists all available disk offerings.", responseObject = DiskOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListDiskOfferingsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDiskOfferingsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
index 08c69e8..abeebcb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
@@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-@APICommand(name = "listServiceOfferings", description = "Lists all available service offerings.", responseObject = ServiceOfferingResponse.class)
+@APICommand(name = "listServiceOfferings", description = "Lists all available service offerings.", responseObject = ServiceOfferingResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListServiceOfferingsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
index 66c64a6..5b1b76e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java
@@ -31,7 +31,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
-@APICommand(name = "activateProject", description = "Activates a project", responseObject = ProjectResponse.class, since = "3.0.0")
+@APICommand(name = "activateProject", description = "Activates a project", responseObject = ProjectResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ActivateProjectCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ActivateProjectCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
index dcb83a8..e8a045c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
@@ -34,7 +34,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.projects.Project;
import com.cloud.user.Account;
-@APICommand(name = "createProject", description = "Creates a project", responseObject = ProjectResponse.class, since = "3.0.0")
+@APICommand(name = "createProject", description = "Creates a project", responseObject = ProjectResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateProjectCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateProjectCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
index 88205e8..3a2e48d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java
@@ -32,7 +32,8 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
-@APICommand(name = "deleteProject", description = "Deletes a project", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "deleteProject", description = "Deletes a project", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteProjectCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteProjectCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
index 9d4d838..9f8baad 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "deleteProjectInvitation", description = "Accepts or declines project invitation", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "deleteProjectInvitation", description = "Accepts or declines project invitation", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteProjectInvitationCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteProjectInvitationCmd.class.getName());
private static final String s_name = "deleteprojectinvitationresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
index 0e9e7ae..dc607e4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java
@@ -29,7 +29,9 @@ import org.apache.cloudstack.api.response.ProjectResponse;
@APICommand(name = "listProjectInvitations",
description = "Lists projects and provides detailed information for listed projects",
responseObject = ProjectInvitationResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListProjectInvitationsCmd extends BaseListAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListProjectInvitationsCmd.class.getName());
private static final String s_name = "listprojectinvitationsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
index 2cf6106..7b479b1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
@@ -35,7 +35,9 @@ import com.cloud.exception.InvalidParameterValueException;
@APICommand(name = "listProjects",
description = "Lists projects and provides detailed information for listed projects",
responseObject = ProjectResponse.class,
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListProjectsCmd extends BaseListAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListProjectsCmd.class.getName());
private static final String s_name = "listprojectsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
index c2a1885..69a4b77 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.projects.Project;
-@APICommand(name = "suspendProject", description = "Suspends a project", responseObject = ProjectResponse.class, since = "3.0.0")
+@APICommand(name = "suspendProject", description = "Suspends a project", responseObject = ProjectResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class SuspendProjectCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(SuspendProjectCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
index 78903bf..11e5e35 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java
@@ -32,7 +32,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.projects.Project;
-@APICommand(name = "updateProject", description = "Updates a project", responseObject = ProjectResponse.class, since = "3.0.0")
+@APICommand(name = "updateProject", description = "Updates a project", responseObject = ProjectResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateProjectCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateProjectCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
index dda7b54..79e3f8a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
-@APICommand(name = "updateProjectInvitation", description = "Accepts or declines project invitation", responseObject = SuccessResponse.class, since = "3.0.0")
+@APICommand(name = "updateProjectInvitation", description = "Accepts or declines project invitation", responseObject = SuccessResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateProjectInvitationCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateProjectInvitationCmd.class.getName());
private static final String s_name = "updateprojectinvitationresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
index c369b9c..9a0b186 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ListRegionsCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.RegionResponse;
import org.apache.cloudstack.region.Region;
import org.apache.cloudstack.region.RegionService;
-@APICommand(name = "listRegions", description = "Lists Regions", responseObject = RegionResponse.class)
+@APICommand(name = "listRegions", description = "Lists Regions", responseObject = RegionResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListRegionsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListRegionsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
index 1fe73b5..177939b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
@@ -49,7 +49,9 @@ import com.cloud.utils.db.EntityManager;
@APICommand(name = "assignToGlobalLoadBalancerRule",
description = "Assign load balancer rule or list of load " + "balancer rules to a global load balancer rules.",
- responseObject = SuccessResponse.class)
+ responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class AssignToGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AssignToGlobalLoadBalancerRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
index 550d817..7015703 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
@@ -39,7 +39,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.region.ha.GlobalLoadBalancerRule;
import com.cloud.region.ha.GlobalLoadBalancingRulesService;
-@APICommand(name = "createGlobalLoadBalancerRule", description = "Creates a global load balancer rule", responseObject = GlobalLoadBalancerResponse.class)
+@APICommand(name = "createGlobalLoadBalancerRule", description = "Creates a global load balancer rule", responseObject = GlobalLoadBalancerResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateGlobalLoadBalancerRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
index 2e96965..dfb093d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java
@@ -37,7 +37,8 @@ import com.cloud.region.ha.GlobalLoadBalancerRule;
import com.cloud.region.ha.GlobalLoadBalancingRulesService;
import com.cloud.user.Account;
-@APICommand(name = "deleteGlobalLoadBalancerRule", description = "Deletes a global load balancer rule.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteGlobalLoadBalancerRule", description = "Deletes a global load balancer rule.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteGlobalLoadBalancerRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
index f37aba2..e5630f8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
@@ -35,7 +35,8 @@ import org.apache.cloudstack.api.response.RegionResponse;
import com.cloud.region.ha.GlobalLoadBalancerRule;
import com.cloud.region.ha.GlobalLoadBalancingRulesService;
-@APICommand(name = "listGlobalLoadBalancerRules", description = "Lists load balancer rules.", responseObject = GlobalLoadBalancerResponse.class)
+@APICommand(name = "listGlobalLoadBalancerRules", description = "Lists load balancer rules.", responseObject = GlobalLoadBalancerResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListGlobalLoadBalancerRuleCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListGlobalLoadBalancerRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
index b30f4d8..af3fa34 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
@@ -43,7 +43,9 @@ import com.cloud.utils.StringUtils;
@APICommand(name = "removeFromGlobalLoadBalancerRule",
description = "Removes a load balancer rule association with" + " global load balancer rule",
- responseObject = SuccessResponse.class)
+ responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class RemoveFromGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RemoveFromGlobalLoadBalancerRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
index e8c5326..6c75400 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
@@ -34,7 +34,8 @@ import com.cloud.region.ha.GlobalLoadBalancerRule;
import com.cloud.region.ha.GlobalLoadBalancingRulesService;
import com.cloud.user.Account;
-@APICommand(name = "updateGlobalLoadBalancerRule", description = "update global load balancer rules.", responseObject = GlobalLoadBalancerResponse.class)
+@APICommand(name = "updateGlobalLoadBalancerRule", description = "update global load balancer rules.", responseObject = GlobalLoadBalancerResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(GlobalLoadBalancerResponse.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
index ccaca2d..366401f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.UserResponse;
import com.cloud.user.Account;
-@APICommand(name = "getCloudIdentifier", description = "Retrieves a cloud identifier.", responseObject = CloudIdentifierResponse.class)
+@APICommand(name = "getCloudIdentifier", description = "Retrieves a cloud identifier.", responseObject = CloudIdentifierResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class GetCloudIdentifierCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(GetCloudIdentifierCmd.class.getName());
private static final String s_name = "getcloudidentifierresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
index 5e546f4..edaa405 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.user.Account;
-@APICommand(name = "listHypervisors", description = "List hypervisors", responseObject = HypervisorResponse.class)
+@APICommand(name = "listHypervisors", description = "List hypervisors", responseObject = HypervisorResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListHypervisorsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeRouterCmd.class.getName());
private static final String s_name = "listhypervisorsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
index ba3cfc8..bd8942a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
@@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.ResourceLimitResponse;
import com.cloud.configuration.ResourceLimit;
-@APICommand(name = "listResourceLimits", description = "Lists resource limits.", responseObject = ResourceLimitResponse.class)
+@APICommand(name = "listResourceLimits", description = "Lists resource limits.", responseObject = ResourceLimitResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListResourceLimitsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
index bd4f995..2616875 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
@@ -36,7 +36,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.configuration.ResourceCount;
import com.cloud.user.Account;
-@APICommand(name = "updateResourceCount", description = "Recalculate and update resource count for an account or domain.", responseObject = ResourceCountResponse.class)
+@APICommand(name = "updateResourceCount", description = "Recalculate and update resource count for an account or domain.", responseObject = ResourceCountResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateResourceCountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateResourceCountCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
index c33a9e7..015cafb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.configuration.ResourceLimit;
-@APICommand(name = "updateResourceLimit", description = "Updates resource limits for an account or domain.", responseObject = ResourceLimitResponse.class)
+@APICommand(name = "updateResourceLimit", description = "Updates resource limits for an account or domain.", responseObject = ResourceLimitResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateResourceLimitCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateResourceLimitCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
index 6a054a4..748f60c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
@@ -45,7 +45,9 @@ import com.cloud.utils.StringUtils;
@APICommand(name = "authorizeSecurityGroupEgress",
responseObject = SecurityGroupRuleResponse.class,
description = "Authorizes a particular egress rule for this security group",
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
@SuppressWarnings("rawtypes")
public class AuthorizeSecurityGroupEgressCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AuthorizeSecurityGroupIngressCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
index be91959..d93a57c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
@@ -44,7 +44,9 @@ import com.cloud.utils.StringUtils;
@APICommand(name = "authorizeSecurityGroupIngress",
responseObject = SecurityGroupRuleResponse.class,
- description = "Authorizes a particular ingress rule for this security group")
+ description = "Authorizes a particular ingress rule for this security group",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
@SuppressWarnings("rawtypes")
public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AuthorizeSecurityGroupIngressCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
index 3b16821..9e1bae3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.network.security.SecurityGroup;
import com.cloud.user.Account;
-@APICommand(name = "createSecurityGroup", responseObject = SecurityGroupResponse.class, description = "Creates a security group")
+@APICommand(name = "createSecurityGroup", responseObject = SecurityGroupResponse.class, description = "Creates a security group",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateSecurityGroupCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateSecurityGroupCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
index 0bcc144..2b23ac0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
@@ -33,7 +33,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceInUseException;
-@APICommand(name = "deleteSecurityGroup", description = "Deletes security group", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteSecurityGroup", description = "Deletes security group", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSecurityGroupCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteSecurityGroupCmd.class.getName());
private static final String s_name = "deletesecuritygroupresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
index ae745b3..aa0c01b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java
@@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
-@APICommand(name = "listSecurityGroups", description = "Lists security groups", responseObject = SecurityGroupResponse.class)
+@APICommand(name = "listSecurityGroups", description = "Lists security groups", responseObject = SecurityGroupResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSecurityGroupsCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListSecurityGroupsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
index 006aa7d..db341a3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
@@ -36,7 +36,9 @@ import com.cloud.user.Account;
@APICommand(name = "revokeSecurityGroupEgress",
responseObject = SuccessResponse.class,
description = "Deletes a particular egress rule from this security group",
- since = "3.0.0")
+ since = "3.0.0",
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class RevokeSecurityGroupEgressCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RevokeSecurityGroupEgressCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
index 0858578..708277c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
@@ -33,7 +33,8 @@ import com.cloud.network.security.SecurityGroup;
import com.cloud.network.security.SecurityRule;
import com.cloud.user.Account;
-@APICommand(name = "revokeSecurityGroupIngress", responseObject = SuccessResponse.class, description = "Deletes a particular ingress rule from this security group")
+@APICommand(name = "revokeSecurityGroupIngress", responseObject = SuccessResponse.class, description = "Deletes a particular ingress rule from this security group",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RevokeSecurityGroupIngressCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RevokeSecurityGroupIngressCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
index a0f307b..b764a41 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
@@ -41,7 +41,8 @@ import com.cloud.storage.Snapshot;
import com.cloud.storage.Volume;
import com.cloud.user.Account;
-@APICommand(name = "createSnapshot", description = "Creates an instant snapshot of a volume.", responseObject = SnapshotResponse.class)
+@APICommand(name = "createSnapshot", description = "Creates an instant snapshot of a volume.", responseObject = SnapshotResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateSnapshotCmd.class.getName());
private static final String s_name = "createsnapshotresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
index 5ecbaaa..c1381c8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java
@@ -34,7 +34,8 @@ import com.cloud.storage.Volume;
import com.cloud.storage.snapshot.SnapshotPolicy;
import com.cloud.user.Account;
-@APICommand(name = "createSnapshotPolicy", description = "Creates a snapshot policy for the account.", responseObject = SnapshotPolicyResponse.class)
+@APICommand(name = "createSnapshotPolicy", description = "Creates a snapshot policy for the account.", responseObject = SnapshotPolicyResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateSnapshotPolicyCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateSnapshotPolicyCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
index 35caaff..deeeb78 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java
@@ -33,7 +33,8 @@ import com.cloud.event.EventTypes;
import com.cloud.storage.Snapshot;
import com.cloud.user.Account;
-@APICommand(name = "deleteSnapshot", description = "Deletes a snapshot of a disk volume.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteSnapshot", description = "Deletes a snapshot of a disk volume.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSnapshotCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteSnapshotCmd.class.getName());
private static final String s_name = "deletesnapshotresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
index bcccf8b..2d97d3d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
-@APICommand(name = "deleteSnapshotPolicies", description = "Deletes snapshot policies for the account.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteSnapshotPolicies", description = "Deletes snapshot policies for the account.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSnapshotPoliciesCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteSnapshotPoliciesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
index 7c2899f..ffafe2d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java
@@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.VolumeResponse;
import com.cloud.storage.snapshot.SnapshotPolicy;
import com.cloud.utils.Pair;
-@APICommand(name = "listSnapshotPolicies", description = "Lists snapshot policies.", responseObject = SnapshotPolicyResponse.class)
+@APICommand(name = "listSnapshotPolicies", description = "Lists snapshot policies.", responseObject = SnapshotPolicyResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSnapshotPoliciesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListSnapshotPoliciesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
index e4d566a..320ed63 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.storage.Snapshot;
import com.cloud.utils.Pair;
-@APICommand(name = "listSnapshots", description = "Lists all available snapshots for the account.", responseObject = SnapshotResponse.class)
+@APICommand(name = "listSnapshots", description = "Lists all available snapshots for the account.", responseObject = SnapshotResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSnapshotsCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListSnapshotsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java
index f11fa3f..5608215 100644
--- a/api/src/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java
@@ -34,7 +34,8 @@ import com.cloud.event.EventTypes;
import com.cloud.storage.Snapshot;
import com.cloud.user.Account;
-@APICommand(name = "revertSnapshot", description = "revert a volume snapshot.", responseObject = SnapshotResponse.class)
+@APICommand(name = "revertSnapshot", description = "revert a volume snapshot.", responseObject = SnapshotResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RevertSnapshotCmd extends BaseAsyncCmd {
private static final String s_name = "revertsnapshotresponse";
@Parameter(name = ApiConstants.ID, type = BaseCmd.CommandType.UUID, entityType = SnapshotResponse.class, required = true, description = "The ID of the snapshot")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
index 1fc9d13..3da6dc1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.SSHKeyPair;
-@APICommand(name = "createSSHKeyPair", description = "Create a new keypair and returns the private key", responseObject = CreateSSHKeyPairResponse.class)
+@APICommand(name = "createSSHKeyPair", description = "Create a new keypair and returns the private key", responseObject = CreateSSHKeyPairResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class CreateSSHKeyPairCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateSSHKeyPairCmd.class.getName());
private static final String s_name = "createsshkeypairresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
index a638eb9..cddf199 100644
--- a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
-@APICommand(name = "deleteSSHKeyPair", description = "Deletes a keypair by name", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteSSHKeyPair", description = "Deletes a keypair by name", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSSHKeyPairCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateSSHKeyPairCmd.class.getName());
private static final String s_name = "deletesshkeypairresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
index 52fca5f..98f5937 100644
--- a/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.SSHKeyPairResponse;
import com.cloud.user.SSHKeyPair;
import com.cloud.utils.Pair;
-@APICommand(name = "listSSHKeyPairs", description = "List registered keypairs", responseObject = SSHKeyPairResponse.class)
+@APICommand(name = "listSSHKeyPairs", description = "List registered keypairs", responseObject = SSHKeyPairResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSSHKeyPairsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListSSHKeyPairsCmd.class.getName());
private static final String s_name = "listsshkeypairsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
index 8ed5cbd..5b330f3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
@@ -29,7 +29,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.user.SSHKeyPair;
-@APICommand(name = "registerSSHKeyPair", description = "Register a public key in a keypair under a certain name", responseObject = SSHKeyPairResponse.class)
+@APICommand(name = "registerSSHKeyPair", description = "Register a public key in a keypair under a certain name", responseObject = SSHKeyPairResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RegisterSSHKeyPairCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(RegisterSSHKeyPairCmd.class.getName());
private static final String s_name = "registersshkeypairresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
index ee0add4..4fcc9cb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
@@ -37,7 +37,8 @@ import com.cloud.event.EventTypes;
import com.cloud.server.ResourceTag;
import com.cloud.server.ResourceTag.ResourceObjectType;
-@APICommand(name = "createTags", description = "Creates resource tag(s)", responseObject = SuccessResponse.class, since = "4.0.0")
+@APICommand(name = "createTags", description = "Creates resource tag(s)", responseObject = SuccessResponse.class, since = "4.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateTagsCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CreateTagsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
index 3ee7c06..da6249f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java
@@ -36,7 +36,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.server.ResourceTag.ResourceObjectType;
-@APICommand(name = "deleteTags", description = "Deleting resource tag(s)", responseObject = SuccessResponse.class, since = "4.0.0")
+@APICommand(name = "deleteTags", description = "Deleting resource tag(s)", responseObject = SuccessResponse.class, since = "4.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteTagsCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteTagsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java
index 893f6df..9ff3a74 100644
--- a/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java
@@ -24,7 +24,8 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ResourceTagResponse;
-@APICommand(name = "listTags", description = "List resource tag(s)", responseObject = ResourceTagResponse.class, since = "4.0.0")
+@APICommand(name = "listTags", description = "List resource tag(s)", responseObject = ResourceTagResponse.class, since = "4.0.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListTagsCmd extends BaseListProjectAndAccountResourcesCmd {
private static final String s_name = "listtagsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
index 87f94f7..feceed5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.StorageUnavailableException;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-@APICommand(name = "copyTemplate", description = "Copies a template from one zone to another.", responseObject = TemplateResponse.class)
+@APICommand(name = "copyTemplate", description = "Copies a template from one zone to another.", responseObject = TemplateResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CopyTemplateCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CopyTemplateCmd.class.getName());
private static final String s_name = "copytemplateresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
index 0030a7e..62d9ff6 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
@@ -48,7 +48,8 @@ import com.cloud.user.Account;
@APICommand(name = "createTemplate", responseObject = TemplateResponse.class, description = "Creates a template of a virtual machine. "
+ "The virtual machine must be in a STOPPED state. "
- + "A template created from this command is automatically designated as a private template visible to the account that created it.")
+ + "A template created from this command is automatically designated as a private template visible to the account that created it.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateTemplateCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateTemplateCmd.class.getName());
private static final String s_name = "createtemplateresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
index 890af70..98d53be 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
@@ -36,7 +36,8 @@ import com.cloud.user.Account;
@APICommand(name = "deleteTemplate",
responseObject = SuccessResponse.class,
- description = "Deletes a template from the system. All virtual machines using the deleted template will not be affected.")
+ description = "Deletes a template from the system. All virtual machines using the deleted template will not be affected.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteTemplateCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteTemplateCmd.class.getName());
private static final String s_name = "deletetemplateresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
index 082f46a..c88b5e3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.InternalErrorException;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-@APICommand(name = "extractTemplate", description = "Extracts a template", responseObject = ExtractResponse.class)
+@APICommand(name = "extractTemplate", description = "Extracts a template", responseObject = ExtractResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ExtractTemplateCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ExtractTemplateCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
index 08acf63..3576704 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
@@ -27,7 +27,9 @@ import com.cloud.template.VirtualMachineTemplate;
@APICommand(name = "listTemplatePermissions",
description = "List template visibility and all accounts that have permissions to view this template.",
- responseObject = TemplatePermissionsResponse.class)
+ responseObject = TemplatePermissionsResponse.class,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false)
public class ListTemplatePermissionsCmd extends BaseListTemplateOrIsoPermissionsCmd {
protected String getResponseName() {
return "listtemplatepermissionsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
index d393c6a..9e95cf6 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
import com.cloud.user.Account;
-@APICommand(name = "listTemplates", description = "List all public, private, and privileged templates.", responseObject = TemplateResponse.class)
+@APICommand(name = "listTemplates", description = "List all public, private, and privileged templates.", responseObject = TemplateResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListTemplatesCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListTemplatesCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
index 48ed6ea..61e9428 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
@@ -41,7 +41,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.template.VirtualMachineTemplate;
-@APICommand(name = "registerTemplate", description = "Registers an existing template into the CloudStack cloud. ", responseObject = TemplateResponse.class)
+@APICommand(name = "registerTemplate", description = "Registers an existing template into the CloudStack cloud. ", responseObject = TemplateResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RegisterTemplateCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(RegisterTemplateCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
index f80a4ee..bad3a2f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
@@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-@APICommand(name = "updateTemplate", description = "Updates attributes of a template.", responseObject = TemplateResponse.class)
+@APICommand(name = "updateTemplate", description = "Updates attributes of a template.", responseObject = TemplateResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateTemplateCmd extends BaseUpdateTemplateOrIsoCmd {
public static final Logger s_logger = Logger.getLogger(UpdateTemplateCmd.class.getName());
private static final String s_name = "updatetemplateresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
index 96d1f55..4c94e57 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java
@@ -27,7 +27,8 @@ import com.cloud.user.Account;
@APICommand(name = "updateTemplatePermissions", responseObject = SuccessResponse.class, description = "Updates a template visibility permissions. "
+ "A public template is visible to all accounts within the same domain. " + "A private template is visible only to the owner of the template. "
- + "A priviledged template is a private template with account permissions added. " + "Only accounts specified under the template permissions are visible to them.")
+ + "A priviledged template is a private template with account permissions added. " + "Only accounts specified under the template permissions are visible to them.",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateTemplatePermissionsCmd extends BaseUpdateTemplateOrIsoPermissionsCmd {
@Override
protected String getResponseName() {
[12/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/PoolPatch.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/PoolPatch.java b/deps/XenServerJava/src/com/xensource/xenapi/PoolPatch.java
index 7361bc7..99ac7e8 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/PoolPatch.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/PoolPatch.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class PoolPatch extends XenAPIObject {
* For internal use only.
*/
PoolPatch(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class PoolPatch extends XenAPIObject {
{
if (obj != null && obj instanceof PoolPatch)
{
- PoolPatch other = (PoolPatch)obj;
+ PoolPatch other = (PoolPatch) obj;
return other.ref.equals(this.ref);
} else
{
@@ -114,8 +115,8 @@ public class PoolPatch extends XenAPIObject {
/**
* Convert a pool_patch.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -172,15 +173,15 @@ public class PoolPatch extends XenAPIObject {
* @return all fields from the object
*/
public PoolPatch.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPoolPatchRecord(result);
+ return Types.toPoolPatchRecord(result);
}
/**
@@ -190,15 +191,15 @@ public class PoolPatch extends XenAPIObject {
* @return reference to the object
*/
public static PoolPatch getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPoolPatch(result);
+ return Types.toPoolPatch(result);
}
/**
@@ -208,15 +209,15 @@ public class PoolPatch extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<PoolPatch> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPoolPatch(result);
+ return Types.toSetOfPoolPatch(result);
}
/**
@@ -225,15 +226,15 @@ public class PoolPatch extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -242,15 +243,15 @@ public class PoolPatch extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -259,15 +260,15 @@ public class PoolPatch extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -276,15 +277,15 @@ public class PoolPatch extends XenAPIObject {
* @return value of the field
*/
public String getVersion(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_version";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -293,15 +294,15 @@ public class PoolPatch extends XenAPIObject {
* @return value of the field
*/
public Long getSize(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_size";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -310,15 +311,15 @@ public class PoolPatch extends XenAPIObject {
* @return value of the field
*/
public Boolean getPoolApplied(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_pool_applied";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -327,15 +328,15 @@ public class PoolPatch extends XenAPIObject {
* @return value of the field
*/
public Set<HostPatch> getHostPatches(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_host_patches";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHostPatch(result);
+ return Types.toSetOfHostPatch(result);
}
/**
@@ -344,15 +345,15 @@ public class PoolPatch extends XenAPIObject {
* @return value of the field
*/
public Set<Types.AfterApplyGuidance> getAfterApplyGuidance(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_after_apply_guidance";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfAfterApplyGuidance(result);
+ return Types.toSetOfAfterApplyGuidance(result);
}
/**
@@ -361,15 +362,15 @@ public class PoolPatch extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -378,9 +379,9 @@ public class PoolPatch extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -395,9 +396,9 @@ public class PoolPatch extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -411,9 +412,9 @@ public class PoolPatch extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -428,9 +429,9 @@ public class PoolPatch extends XenAPIObject {
* @return Task
*/
public Task applyAsync(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool_patch.apply";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(host)};
@@ -446,15 +447,15 @@ public class PoolPatch extends XenAPIObject {
* @return the output of the patch application process
*/
public String apply(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.apply";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(host)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -463,9 +464,9 @@ public class PoolPatch extends XenAPIObject {
* @return Task
*/
public Task poolApplyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool_patch.pool_apply";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -479,9 +480,9 @@ public class PoolPatch extends XenAPIObject {
*
*/
public void poolApply(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.pool_apply";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -496,9 +497,9 @@ public class PoolPatch extends XenAPIObject {
* @return Task
*/
public Task precheckAsync(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool_patch.precheck";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(host)};
@@ -514,15 +515,15 @@ public class PoolPatch extends XenAPIObject {
* @return the output of the patch prechecks
*/
public String precheck(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.precheck";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(host)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -531,9 +532,9 @@ public class PoolPatch extends XenAPIObject {
* @return Task
*/
public Task cleanAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool_patch.clean";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -547,9 +548,9 @@ public class PoolPatch extends XenAPIObject {
*
*/
public void clean(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.clean";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -563,9 +564,9 @@ public class PoolPatch extends XenAPIObject {
* @return Task
*/
public Task poolCleanAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool_patch.pool_clean";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -579,9 +580,9 @@ public class PoolPatch extends XenAPIObject {
*
*/
public void poolClean(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.pool_clean";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -595,9 +596,9 @@ public class PoolPatch extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool_patch.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -611,9 +612,9 @@ public class PoolPatch extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -628,9 +629,9 @@ public class PoolPatch extends XenAPIObject {
* @return Task
*/
public Task cleanOnHostAsync(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.pool_patch.clean_on_host";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(host)};
@@ -645,9 +646,9 @@ public class PoolPatch extends XenAPIObject {
* @param host The host on which to clean the patch
*/
public void cleanOnHost(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.clean_on_host";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(host)};
@@ -661,15 +662,15 @@ public class PoolPatch extends XenAPIObject {
* @return references to all objects
*/
public static Set<PoolPatch> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPoolPatch(result);
+ return Types.toSetOfPoolPatch(result);
}
/**
@@ -678,15 +679,15 @@ public class PoolPatch extends XenAPIObject {
* @return records of all objects
*/
public static Map<PoolPatch, PoolPatch.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "pool_patch.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfPoolPatchPoolPatchRecord(result);
+ return Types.toMapOfPoolPatchPoolPatchRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Role.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Role.java b/deps/XenServerJava/src/com/xensource/xenapi/Role.java
index 5808b13..c9eaeaa 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Role.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Role.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Role extends XenAPIObject {
* For internal use only.
*/
Role(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Role extends XenAPIObject {
{
if (obj != null && obj instanceof Role)
{
- Role other = (Role)obj;
+ Role other = (Role) obj;
return other.ref.equals(this.ref);
} else
{
@@ -109,8 +110,8 @@ public class Role extends XenAPIObject {
/**
* Convert a role.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -142,15 +143,15 @@ public class Role extends XenAPIObject {
* @return all fields from the object
*/
public Role.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toRoleRecord(result);
+ return Types.toRoleRecord(result);
}
/**
@@ -160,15 +161,15 @@ public class Role extends XenAPIObject {
* @return reference to the object
*/
public static Role getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toRole(result);
+ return Types.toRole(result);
}
/**
@@ -178,15 +179,15 @@ public class Role extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<Role> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfRole(result);
+ return Types.toSetOfRole(result);
}
/**
@@ -195,15 +196,15 @@ public class Role extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -212,15 +213,15 @@ public class Role extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -229,15 +230,15 @@ public class Role extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -246,15 +247,15 @@ public class Role extends XenAPIObject {
* @return value of the field
*/
public Set<Role> getSubroles(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_subroles";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfRole(result);
+ return Types.toSetOfRole(result);
}
/**
@@ -263,15 +264,15 @@ public class Role extends XenAPIObject {
* @return a list of permissions
*/
public Set<Role> getPermissions(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_permissions";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfRole(result);
+ return Types.toSetOfRole(result);
}
/**
@@ -280,15 +281,15 @@ public class Role extends XenAPIObject {
* @return a list of permission names
*/
public Set<String> getPermissionsNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_permissions_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -297,15 +298,15 @@ public class Role extends XenAPIObject {
* @return a list of references to roles
*/
public Set<Role> getByPermission(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_by_permission";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfRole(result);
+ return Types.toSetOfRole(result);
}
/**
@@ -315,15 +316,15 @@ public class Role extends XenAPIObject {
* @return a list of references to roles
*/
public static Set<Role> getByPermissionNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_by_permission_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfRole(result);
+ return Types.toSetOfRole(result);
}
/**
@@ -332,15 +333,15 @@ public class Role extends XenAPIObject {
* @return references to all objects
*/
public static Set<Role> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfRole(result);
+ return Types.toSetOfRole(result);
}
/**
@@ -349,15 +350,15 @@ public class Role extends XenAPIObject {
* @return records of all objects
*/
public static Map<Role, Role.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "role.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfRoleRoleRecord(result);
+ return Types.toMapOfRoleRoleRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/SM.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/SM.java b/deps/XenServerJava/src/com/xensource/xenapi/SM.java
index 0ec3626..6950fcd 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/SM.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/SM.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class SM extends XenAPIObject {
* For internal use only.
*/
SM(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class SM extends XenAPIObject {
{
if (obj != null && obj instanceof SM)
{
- SM other = (SM)obj;
+ SM other = (SM) obj;
return other.ref.equals(this.ref);
} else
{
@@ -109,6 +110,7 @@ public class SM extends XenAPIObject {
print.printf("%1$20s: %2$s\n", "requiredApiVersion", this.requiredApiVersion);
print.printf("%1$20s: %2$s\n", "configuration", this.configuration);
print.printf("%1$20s: %2$s\n", "capabilities", this.capabilities);
+ print.printf("%1$20s: %2$s\n", "features", this.features);
print.printf("%1$20s: %2$s\n", "otherConfig", this.otherConfig);
print.printf("%1$20s: %2$s\n", "driverFilename", this.driverFilename);
return writer.toString();
@@ -117,8 +119,8 @@ public class SM extends XenAPIObject {
/**
* Convert a SM.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -129,6 +131,7 @@ public class SM extends XenAPIObject {
map.put("required_api_version", this.requiredApiVersion == null ? "" : this.requiredApiVersion);
map.put("configuration", this.configuration == null ? new HashMap<String, String>() : this.configuration);
map.put("capabilities", this.capabilities == null ? new LinkedHashSet<String>() : this.capabilities);
+ map.put("features", this.features == null ? new HashMap<String, Long>() : this.features);
map.put("other_config", this.otherConfig == null ? new HashMap<String, String>() : this.otherConfig);
map.put("driver_filename", this.driverFilename == null ? "" : this.driverFilename);
return map;
@@ -175,6 +178,10 @@ public class SM extends XenAPIObject {
*/
public Set<String> capabilities;
/**
+ * capabilities of the SM plugin, with capability version numbers
+ */
+ public Map<String, Long> features;
+ /**
* additional configuration
*/
public Map<String, String> otherConfig;
@@ -190,15 +197,15 @@ public class SM extends XenAPIObject {
* @return all fields from the object
*/
public SM.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSMRecord(result);
+ return Types.toSMRecord(result);
}
/**
@@ -208,15 +215,15 @@ public class SM extends XenAPIObject {
* @return reference to the object
*/
public static SM getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSM(result);
+ return Types.toSM(result);
}
/**
@@ -226,15 +233,15 @@ public class SM extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<SM> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfSM(result);
+ return Types.toSetOfSM(result);
}
/**
@@ -243,15 +250,15 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -260,15 +267,15 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -277,15 +284,15 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -294,15 +301,15 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public String getType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -311,15 +318,15 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public String getVendor(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_vendor";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -328,15 +335,15 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public String getCopyright(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_copyright";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -345,15 +352,15 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public String getVersion(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_version";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -362,15 +369,15 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public String getRequiredApiVersion(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_required_api_version";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -379,32 +386,50 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getConfiguration(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_configuration";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
* Get the capabilities field of the given SM.
+ * @deprecated
*
* @return value of the field
*/
- public Set<String> getCapabilities(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public Set<String> getCapabilities(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_capabilities";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
+ }
+
+ /**
+ * Get the features field of the given SM.
+ *
+ * @return value of the field
+ */
+ public Map<String, Long> getFeatures(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "SM.get_features";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toMapOfStringLong(result);
}
/**
@@ -413,15 +438,15 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -430,15 +455,15 @@ public class SM extends XenAPIObject {
* @return value of the field
*/
public String getDriverFilename(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_driver_filename";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -447,9 +472,9 @@ public class SM extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -464,9 +489,9 @@ public class SM extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -480,9 +505,9 @@ public class SM extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -496,15 +521,15 @@ public class SM extends XenAPIObject {
* @return references to all objects
*/
public static Set<SM> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfSM(result);
+ return Types.toSetOfSM(result);
}
/**
@@ -513,15 +538,15 @@ public class SM extends XenAPIObject {
* @return records of all objects
*/
public static Map<SM, SM.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "SM.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfSMSMRecord(result);
+ return Types.toMapOfSMSMRecord(result);
}
}
\ No newline at end of file
[49/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Merge branch 'acl-item-cidrs' of https://git-wip-us.apache.org/repos/asf/cloudstack.git into acl-item-cidrs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e7dacdf7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e7dacdf7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e7dacdf7
Branch: refs/heads/acl-item-cidrs
Commit: e7dacdf75859b1d29f8b47fb258eb31f97ef4ff8
Parents: 106113a 00704ee
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Feb 26 19:47:58 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Feb 26 19:47:58 2014 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[34/50] [abbrv] - Updated APICommand annotation to add new flags that
indicate if API request or response carry sensitive info - Updated all API
classes with the new annotation flag values as per the API's sensitivity -
Updated server code to check respo
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java
index b24aa05..358d2e4 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java
@@ -33,7 +33,8 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.element.JuniperSRXFirewallElementService;
import com.cloud.user.Account;
-@APICommand(name = "deleteExternalFirewall", description = "Deletes an external firewall appliance.", responseObject = SuccessResponse.class)
+@APICommand(name = "deleteExternalFirewall", description = "Deletes an external firewall appliance.", responseObject = SuccessResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteExternalFirewallCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteExternalFirewallCmd.class.getName());
private static final String s_name = "deleteexternalfirewallresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java
index 75aadc2..3fa0278 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java
@@ -39,7 +39,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.element.JuniperSRXFirewallElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteSrxFirewall", responseObject = SuccessResponse.class, description = " delete a SRX firewall device")
+@APICommand(name = "deleteSrxFirewall", responseObject = SuccessResponse.class, description = " delete a SRX firewall device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSrxFirewallCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteSrxFirewallCmd.class.getName());
private static final String s_name = "deletesrxfirewallresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java
index f87574e..9fd7b4c 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java
@@ -35,7 +35,8 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.host.Host;
import com.cloud.network.element.JuniperSRXFirewallElementService;
-@APICommand(name = "listExternalFirewalls", description = "List external firewall appliances.", responseObject = ExternalFirewallResponse.class)
+@APICommand(name = "listExternalFirewalls", description = "List external firewall appliances.", responseObject = ExternalFirewallResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListExternalFirewallsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName());
private static final String s_name = "listexternalfirewallsresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java
index a2d99a5..c0e1079 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java
@@ -42,7 +42,8 @@ import com.cloud.network.Network;
import com.cloud.network.element.JuniperSRXFirewallElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listSrxFirewallNetworks", responseObject = NetworkResponse.class, description = "lists network that are using SRX firewall device")
+@APICommand(name = "listSrxFirewallNetworks", responseObject = NetworkResponse.class, description = "lists network that are using SRX firewall device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSrxFirewallNetworksCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListSrxFirewallNetworksCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java
index e8cdcd5..244da1b 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java
@@ -42,7 +42,8 @@ import com.cloud.network.dao.ExternalFirewallDeviceVO;
import com.cloud.network.element.JuniperSRXFirewallElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listSrxFirewalls", responseObject = SrxFirewallResponse.class, description = "lists SRX firewall devices in a physical network")
+@APICommand(name = "listSrxFirewalls", responseObject = SrxFirewallResponse.class, description = "lists SRX firewall devices in a physical network",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSrxFirewallsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListSrxFirewallsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
index b744fff..2a74806 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
@@ -39,7 +39,8 @@ import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
import com.cloud.network.element.NetscalerLoadBalancerElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addNetscalerLoadBalancer", responseObject = NetscalerLoadBalancerResponse.class, description = "Adds a netscaler load balancer device")
+@APICommand(name = "addNetscalerLoadBalancer", responseObject = NetscalerLoadBalancerResponse.class, description = "Adds a netscaler load balancer device",
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class AddNetscalerLoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddNetscalerLoadBalancerCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java
index f8bfd74..9a25f3b 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ConfigureNetscalerLoadBalancerCmd.java
@@ -40,7 +40,8 @@ import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
import com.cloud.network.element.NetscalerLoadBalancerElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "configureNetscalerLoadBalancer", responseObject = NetscalerLoadBalancerResponse.class, description = "configures a netscaler load balancer device")
+@APICommand(name = "configureNetscalerLoadBalancer", responseObject = NetscalerLoadBalancerResponse.class, description = "configures a netscaler load balancer device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ConfigureNetscalerLoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ConfigureNetscalerLoadBalancerCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java
index f0f6747..1baa7b0 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java
@@ -38,7 +38,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.element.NetscalerLoadBalancerElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteNetscalerLoadBalancer", responseObject = SuccessResponse.class, description = " delete a netscaler load balancer device")
+@APICommand(name = "deleteNetscalerLoadBalancer", responseObject = SuccessResponse.class, description = " delete a netscaler load balancer device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetscalerLoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetscalerLoadBalancerCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java
index 25d1487..67287ae 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java
@@ -42,7 +42,8 @@ import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "listNetscalerLoadBalancerNetworks",
responseObject = NetworkResponse.class,
- description = "lists network that are using a netscaler load balancer device")
+ description = "lists network that are using a netscaler load balancer device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNetscalerLoadBalancerNetworksCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetscalerLoadBalancerNetworksCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java
index 75d03d7..2d9ca24 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java
@@ -40,7 +40,8 @@ import com.cloud.network.dao.ExternalLoadBalancerDeviceVO;
import com.cloud.network.element.NetscalerLoadBalancerElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listNetscalerLoadBalancers", responseObject = NetscalerLoadBalancerResponse.class, description = "lists netscaler load balancer devices")
+@APICommand(name = "listNetscalerLoadBalancers", responseObject = NetscalerLoadBalancerResponse.class, description = "lists netscaler load balancer devices",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNetscalerLoadBalancersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetscalerLoadBalancersCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java
index 37491fd..1a9be28 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java
@@ -41,7 +41,8 @@ import com.cloud.network.NiciraNvpDeviceVO;
import com.cloud.network.element.NiciraNvpElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addNiciraNvpDevice", responseObject = NiciraNvpDeviceResponse.class, description = "Adds a Nicira NVP device")
+@APICommand(name = "addNiciraNvpDevice", responseObject = NiciraNvpDeviceResponse.class, description = "Adds a Nicira NVP device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
private static final String s_name = "addniciranvpdeviceresponse";
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java
index 685debb..d3fadea 100755
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java
@@ -40,7 +40,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.element.NiciraNvpElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteNiciraNvpDevice", responseObject = SuccessResponse.class, description = " delete a nicira nvp device")
+@APICommand(name = "deleteNiciraNvpDevice", responseObject = SuccessResponse.class, description = " delete a nicira nvp device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNiciraNvpDeviceCmd extends BaseAsyncCmd {
private static final String s_name = "deleteniciranvpdeviceresponse";
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java
index 3fb711d..d61d881 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java
@@ -45,7 +45,8 @@ import com.cloud.network.Network;
import com.cloud.network.element.NiciraNvpElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listNiciraNvpDeviceNetworks", responseObject = NetworkResponse.class, description = "lists network that are using a nicira nvp device")
+@APICommand(name = "listNiciraNvpDeviceNetworks", responseObject = NetworkResponse.class, description = "lists network that are using a nicira nvp device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNiciraNvpDeviceNetworksCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNiciraNvpDeviceNetworksCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java
index 260d60f..6cc8f5d 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java
@@ -42,7 +42,8 @@ import com.cloud.network.NiciraNvpDeviceVO;
import com.cloud.network.element.NiciraNvpElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listNiciraNvpDevices", responseObject = NiciraNvpDeviceResponse.class, description = "Lists Nicira NVP devices")
+@APICommand(name = "listNiciraNvpDevices", responseObject = NiciraNvpDeviceResponse.class, description = "Lists Nicira NVP devices",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNiciraNvpDevicesCmd extends BaseListCmd {
private static final String s_name = "listniciranvpdeviceresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/AddOpenDaylightControllerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/AddOpenDaylightControllerCmd.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/AddOpenDaylightControllerCmd.java
index 80130c0..ad92a22 100644
--- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/AddOpenDaylightControllerCmd.java
+++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/AddOpenDaylightControllerCmd.java
@@ -38,7 +38,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
-@APICommand(name = "addOpenDaylightController", responseObject = OpenDaylightControllerResponse.class, description = "Adds an OpenDyalight controler")
+@APICommand(name = "addOpenDaylightController", responseObject = OpenDaylightControllerResponse.class, description = "Adds an OpenDyalight controler",
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class AddOpenDaylightControllerCmd extends BaseAsyncCmd {
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/DeleteOpenDaylightControllerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/DeleteOpenDaylightControllerCmd.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/DeleteOpenDaylightControllerCmd.java
index b556504..ce02e64 100644
--- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/DeleteOpenDaylightControllerCmd.java
+++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/DeleteOpenDaylightControllerCmd.java
@@ -40,7 +40,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
-@APICommand(name = "deleteOpenDaylightController", responseObject = OpenDaylightControllerResponse.class, description = "Removes an OpenDyalight controler")
+@APICommand(name = "deleteOpenDaylightController", responseObject = OpenDaylightControllerResponse.class, description = "Removes an OpenDyalight controler",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteOpenDaylightControllerCmd extends BaseAsyncCmd {
@Inject
private OpenDaylightControllerResourceManager resourceManager;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/ListOpenDaylightControllersCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/ListOpenDaylightControllersCmd.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/ListOpenDaylightControllersCmd.java
index f3e2e39..9737114 100644
--- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/ListOpenDaylightControllersCmd.java
+++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/commands/ListOpenDaylightControllersCmd.java
@@ -42,7 +42,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
-@APICommand(name = "listOpenDaylightControllers", responseObject = OpenDaylightControllerResponse.class, description = "Lists OpenDyalight controllers")
+@APICommand(name = "listOpenDaylightControllers", responseObject = OpenDaylightControllerResponse.class, description = "Lists OpenDyalight controllers",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListOpenDaylightControllersCmd extends BaseCmd {
@Inject
private OpenDaylightControllerResourceManager resourceManager;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java
index 7aba9c2..a2b2cbb 100644
--- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java
+++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/AddPaloAltoFirewallCmd.java
@@ -40,7 +40,8 @@ import com.cloud.network.dao.ExternalFirewallDeviceVO;
import com.cloud.network.element.PaloAltoFirewallElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "addPaloAltoFirewall", responseObject = PaloAltoFirewallResponse.class, description = "Adds a Palo Alto firewall device")
+@APICommand(name = "addPaloAltoFirewall", responseObject = PaloAltoFirewallResponse.class, description = "Adds a Palo Alto firewall device",
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class AddPaloAltoFirewallCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddPaloAltoFirewallCmd.class.getName());
private static final String s_name = "addpaloaltofirewallresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java
index 80f02ad..0c6b3f7 100644
--- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java
+++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ConfigurePaloAltoFirewallCmd.java
@@ -39,7 +39,8 @@ import com.cloud.network.dao.ExternalFirewallDeviceVO;
import com.cloud.network.element.PaloAltoFirewallElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "configurePaloAltoFirewall", responseObject = PaloAltoFirewallResponse.class, description = "Configures a Palo Alto firewall device")
+@APICommand(name = "configurePaloAltoFirewall", responseObject = PaloAltoFirewallResponse.class, description = "Configures a Palo Alto firewall device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ConfigurePaloAltoFirewallCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ConfigurePaloAltoFirewallCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java
index 4f147eb..f59cb38 100644
--- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java
+++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/DeletePaloAltoFirewallCmd.java
@@ -39,7 +39,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.element.PaloAltoFirewallElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deletePaloAltoFirewall", responseObject = SuccessResponse.class, description = " delete a Palo Alto firewall device")
+@APICommand(name = "deletePaloAltoFirewall", responseObject = SuccessResponse.class, description = " delete a Palo Alto firewall device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeletePaloAltoFirewallCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeletePaloAltoFirewallCmd.class.getName());
private static final String s_name = "deletepaloaltofirewallresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java
index d1b7425..c7879cf 100644
--- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java
+++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallNetworksCmd.java
@@ -42,7 +42,8 @@ import com.cloud.network.Network;
import com.cloud.network.element.PaloAltoFirewallElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listPaloAltoFirewallNetworks", responseObject = NetworkResponse.class, description = "lists network that are using Palo Alto firewall device")
+@APICommand(name = "listPaloAltoFirewallNetworks", responseObject = NetworkResponse.class, description = "lists network that are using Palo Alto firewall device",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListPaloAltoFirewallNetworksCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListPaloAltoFirewallNetworksCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java
index ad4be72..cce3ac2 100644
--- a/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java
+++ b/plugins/network-elements/palo-alto/src/com/cloud/api/commands/ListPaloAltoFirewallsCmd.java
@@ -42,7 +42,8 @@ import com.cloud.network.dao.ExternalFirewallDeviceVO;
import com.cloud.network.element.PaloAltoFirewallElementService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "listPaloAltoFirewalls", responseObject = PaloAltoFirewallResponse.class, description = "lists Palo Alto firewall devices in a physical network")
+@APICommand(name = "listPaloAltoFirewalls", responseObject = PaloAltoFirewallResponse.class, description = "lists Palo Alto firewall devices in a physical network",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListPaloAltoFirewallsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListPaloAltoFirewallsCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java
index 085f873..8558c8c 100644
--- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java
+++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java
@@ -37,7 +37,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.host.Host;
-@APICommand(name = "addStratosphereSsp", responseObject = SspResponse.class, description = "Adds stratosphere ssp server")
+@APICommand(name = "addStratosphereSsp", responseObject = SspResponse.class, description = "Adds stratosphere ssp server",
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
public class AddSspCmd extends BaseCmd {
private static final Logger s_logger = Logger.getLogger(AddSspCmd.class.getName());
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java
index e23f642..9eafa0e 100644
--- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java
+++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java
@@ -35,7 +35,8 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
-@APICommand(name = "deleteStratosphereSsp", responseObject = SuccessResponse.class, description = "Removes stratosphere ssp server")
+@APICommand(name = "deleteStratosphereSsp", responseObject = SuccessResponse.class, description = "Removes stratosphere ssp server",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSspCmd extends BaseCmd {
private static final Logger s_logger = Logger.getLogger(AddSspCmd.class.getName());
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java
index 5e424de..619280d 100644
--- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java
+++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java
@@ -50,7 +50,9 @@ import com.cloud.utils.Pair;
* @deprecated as of 4.3 use the new api {@link LdapAddConfigurationCmd}
*/
@Deprecated
-@APICommand(name = "ldapConfig", description = "Configure the LDAP context for this site.", responseObject = LDAPConfigResponse.class, since = "3.0.0")
+@APICommand(name = "ldapConfig", description = "Configure the LDAP context for this site.", responseObject = LDAPConfigResponse.class, since = "3.0.0",
+ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
+
public class LDAPConfigCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(LDAPConfigCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPRemoveCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPRemoveCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPRemoveCmd.java
index 535a545..eb3729d 100644
--- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPRemoveCmd.java
+++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPRemoveCmd.java
@@ -35,7 +35,8 @@ import com.cloud.utils.Pair;
* @deprecated as of 4.3 use the new api {@link LdapDeleteConfigurationCmd}
*/
@Deprecated
-@APICommand(name = "ldapRemove", description = "Remove the LDAP context for this site.", responseObject = LDAPConfigResponse.class, since = "3.0.1")
+@APICommand(name = "ldapRemove", description = "Remove the LDAP context for this site.", responseObject = LDAPConfigResponse.class, since = "3.0.1",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class LDAPRemoveCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(LDAPRemoveCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java
index 5686374..555d1a9 100644
--- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java
+++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.ldap.LdapManager;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
-@APICommand(name = "addLdapConfiguration", description = "Add a new Ldap Configuration", responseObject = LdapConfigurationResponse.class, since = "4.2.0")
+@APICommand(name = "addLdapConfiguration", description = "Add a new Ldap Configuration", responseObject = LdapConfigurationResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class LdapAddConfigurationCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(LdapAddConfigurationCmd.class.getName());
private static final String s_name = "ldapconfigurationresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
index 100ffe6..05d0ef8 100644
--- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
+++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
@@ -42,7 +42,8 @@ import com.cloud.user.Account;
import com.cloud.user.AccountService;
import com.cloud.user.UserAccount;
-@APICommand(name = "ldapCreateAccount", description = "Creates an account from an LDAP user", responseObject = AccountResponse.class, since = "4.2.0")
+@APICommand(name = "ldapCreateAccount", description = "Creates an account from an LDAP user", responseObject = AccountResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class LdapCreateAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(LdapCreateAccountCmd.class.getName());
private static final String s_name = "createaccountresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java
index b45bce5..30b37d8 100644
--- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java
+++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java
@@ -31,7 +31,8 @@ import org.apache.cloudstack.ldap.LdapManager;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
-@APICommand(name = "deleteLdapConfiguration", description = "Remove an Ldap Configuration", responseObject = LdapConfigurationResponse.class, since = "4.2.0")
+@APICommand(name = "deleteLdapConfiguration", description = "Remove an Ldap Configuration", responseObject = LdapConfigurationResponse.class, since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class LdapDeleteConfigurationCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(LdapDeleteConfigurationCmd.class.getName());
private static final String s_name = "ldapconfigurationresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
index 89cec65..887ad00 100644
--- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
+++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
@@ -51,7 +51,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.AccountService;
import com.cloud.user.DomainService;
-@APICommand(name = "importLdapUsers", description = "Import LDAP users", responseObject = LdapUserResponse.class, since = "4.3.0")
+@APICommand(name = "importLdapUsers", description = "Import LDAP users", responseObject = LdapUserResponse.class, since = "4.3.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class LdapImportUsersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(LdapImportUsersCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java
index b50970f..050fb36 100644
--- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java
+++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.ldap.LdapManager;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
-@APICommand(name = "listLdapConfigurations", responseObject = LdapConfigurationResponse.class, description = "Lists all LDAP configurations", since = "4.2.0")
+@APICommand(name = "listLdapConfigurations", responseObject = LdapConfigurationResponse.class, description = "Lists all LDAP configurations", since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class LdapListConfigurationCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(LdapListConfigurationCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java
index 5c65ac4..e655f5f 100644
--- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java
+++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapListUsersCmd.java
@@ -38,7 +38,8 @@ import org.apache.cloudstack.query.QueryService;
import com.cloud.user.Account;
-@APICommand(name = "listLdapUsers", responseObject = LdapUserResponse.class, description = "Lists all LDAP Users", since = "4.2.0")
+@APICommand(name = "listLdapUsers", responseObject = LdapUserResponse.class, description = "Lists all LDAP Users", since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class LdapListUsersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(LdapListUsersCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java
index e2b050d..b488bb7 100644
--- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java
+++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapUserSearchCmd.java
@@ -34,7 +34,8 @@ import org.apache.cloudstack.ldap.NoLdapUserMatchingQueryException;
import com.cloud.user.Account;
-@APICommand(name = "searchLdap", responseObject = LdapUserResponse.class, description = "Searches LDAP based on the username attribute", since = "4.2.0")
+@APICommand(name = "searchLdap", responseObject = LdapUserResponse.class, description = "Searches LDAP based on the username attribute", since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class LdapUserSearchCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(LdapUserSearchCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6d473/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index d715db6..f0fc372 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -365,6 +365,9 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
}
Class<?> cmdClass = getCmdClass(command[0]);
+
+ APICommand annotation = cmdClass.getAnnotation(APICommand.class);
+
if (cmdClass != null) {
BaseCmd cmdObj = (BaseCmd)cmdClass.newInstance();
cmdObj = ComponentContext.inject(cmdObj);
@@ -375,7 +378,13 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
// This is where the command is either serialized, or directly dispatched
response = queueCommand(cmdObj, paramMap);
- buildAuditTrail(auditTrailSb, command[0], response);
+ if (annotation.responseHasSensitiveInfo())
+ {
+ buildAuditTrail(auditTrailSb, command[0],
+ StringUtils.cleanString(response));
+ }
+ else
+ buildAuditTrail(auditTrailSb, command[0], response);
} else {
if (!command[0].equalsIgnoreCase("login") && !command[0].equalsIgnoreCase("logout")) {
String errorString = "Unknown API command: " + command[0];
[33/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Fixed some resource files issues, namely 1) invalid text and duplicate keys resulting from bad merge and 2) trailing spaces which can potentially cause UI issues.
Signed-off-by: Konstantina Chremmou <ko...@citrix.com>
Reviewed-by: Laszlo Hornyak <la...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f05fb9fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f05fb9fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f05fb9fb
Branch: refs/heads/acl-item-cidrs
Commit: f05fb9fb61c3c67ba1c78305022cdbf2434d7acd
Parents: 0e3fde5
Author: Konstantina Chremmou <ko...@citrix.com>
Authored: Mon Feb 24 17:39:31 2014 +0000
Committer: Laszlo Hornyak <la...@gmail.com>
Committed: Tue Feb 25 22:05:06 2014 +0100
----------------------------------------------------------------------
.../classes/resources/messages.properties | 11 -----
.../classes/resources/messages_es.properties | 3 --
.../classes/resources/messages_ja_JP.properties | 11 -----
.../classes/resources/messages_nl_NL.properties | 50 ++++++++++----------
.../classes/resources/messages_pl.properties | 12 ++---
.../classes/resources/messages_pt_BR.properties | 11 +----
.../classes/resources/messages_zh_CN.properties | 13 +----
7 files changed, 33 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f05fb9fb/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index a1752f2..1e91d38 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -16,9 +16,7 @@
# under the License.
label.port=Port
label.remove.ldap=Remove LDAP
-message.remove.ldap=Are you sure you want to delete the LDAP configuration?
label.configure.ldap=Configure LDAP
-message.configure.ldap=Please confirm you would like to configure LDAP.
label.ldap.configuration=LDAP Configuration
label.ldap.port=LDAP port
label.create.nfs.secondary.staging.store=Create NFS secondary staging store
@@ -1320,15 +1318,6 @@ label.add.ucs.manager=Add UCS Manager
label.ovm.traffic.label=OVM traffic label
label.lxc.traffic.label=LXC Traffic Label
label.hyperv.traffic.label=HyperV Traffic Label
-label.port=Port
-label.remove.ldap=Remove LDAP
-label.configure.ldap=Configure LDAP
-label.ldap.configuration=LDAP Configuration
-label.ldap.port=LDAP port
-label.create.nfs.secondary.staging.store=Create NFS secondary staging store
-label.volatile=Volatile
-label.planner.mode=Planner mode
-label.deployment.planner=Deployment planner
managed.state=Managed State
message.acquire.new.ip.vpc=Please confirm that you would like to acquire a new IP for this VPC.
message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f05fb9fb/client/WEB-INF/classes/resources/messages_es.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
index 31a9c93..6d6e486 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -22,7 +22,6 @@ error.session.expired=Su sesi\u00c3\u00b3n ha caducado.
error.unresolved.internet.name=El nombre de Internet no se puede resolver.
extractable=extra\u00c3\u00adble
force.delete.domain.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, la supresi\u00c3\u00b3n de todos los dominios secundarios y todas las cuentas asociadas y sus recursos.
-<<<<<<< HEAD
force.delete=Fuerza Borrar
force.remove=Fuerza Retire
force.remove.host.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, CloudStack para detener la fuerza todas las m\u00c3\u00a1quinas virtuales en ejecuci\u00c3\u00b3n antes de retirar este host del cl\u00c3\u00baster.
@@ -32,7 +31,6 @@ ICMP.code=ICMP C\u00c3\u00b3digo
ICMP.type=Tipo ICMP
image.directory=Directorio de la imagen
inline=en l\u00c3\u00adnea
-=======
force.delete=Forzar el borrado
force.remove=Forzar el retiro
force.remove.host.warning=Advertencia\: Si elige esta opci\u00f3n, CloudStack para detener la fuerza todas las m\u00e1quinas virtuales en ejecuci\u00f3n antes de retirar este host del cl\u00faster.
@@ -44,7 +42,6 @@ image.directory=Directorio de im\u00e1genes
inline=alineado
label.about=Acerca de
label.about.app=Acerca de CloudStack
->>>>>>> 4e449ff... Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config
label.account=Cuenta
label.account.id=ID de la cuenta
label.account.name=Nombre de cuenta
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f05fb9fb/client/WEB-INF/classes/resources/messages_ja_JP.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ja_JP.properties b/client/WEB-INF/classes/resources/messages_ja_JP.properties
index 7dd5bd1..828cf54 100644
--- a/client/WEB-INF/classes/resources/messages_ja_JP.properties
+++ b/client/WEB-INF/classes/resources/messages_ja_JP.properties
@@ -16,9 +16,7 @@
# under the License.
label.port=\u30dd\u30fc\u30c8
label.remove.ldap=LDAP \u306e\u524a\u9664
-message.remove.ldap=LDAP \u69cb\u6210\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
label.configure.ldap=LDAP \u306e\u69cb\u6210
-message.configure.ldap=LDAP \u3092\u69cb\u6210\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
label.ldap.configuration=LDAP \u69cb\u6210
label.ldap.port=LDAP \u30dd\u30fc\u30c8
label.create.nfs.secondary.staging.store=NFS \u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0 \u30b9\u30c8\u30a2\u3092\u4f5c\u6210\u3059\u308b
@@ -1319,15 +1317,6 @@ label.add.ucs.manager=UCS Manager \u306e\u8ffd\u52a0
label.ovm.traffic.label=OVM \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
label.lxc.traffic.label=LXC \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
label.hyperv.traffic.label=Hyper-V \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
-label.port=\u30dd\u30fc\u30c8
-label.remove.ldap=LDAP \u306e\u524a\u9664
-label.configure.ldap=LDAP \u306e\u69cb\u6210
-label.ldap.configuration=LDAP \u69cb\u6210
-label.ldap.port=LDAP \u30dd\u30fc\u30c8
-label.create.nfs.secondary.staging.store=NFS \u30bb\u30ab\u30f3\u30c0\u30ea \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0 \u30b9\u30c8\u30a2\u3092\u4f5c\u6210\u3059\u308b
-label.volatile=\u63ee\u767a\u6027
-label.planner.mode=\u30d7\u30e9\u30f3\u30ca\u30fc \u30e2\u30fc\u30c9
-label.deployment.planner=\u5c55\u958b\u30d7\u30e9\u30f3\u30ca\u30fc
managed.state=\u7ba1\u7406\u5bfe\u8c61\u72b6\u614b
message.acquire.new.ip.vpc=\u3053\u306e VPC \u306e\u65b0\u3057\u3044 IP \u30a2\u30c9\u30ec\u30b9\u3092\u53d6\u5f97\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
message.acquire.new.ip=\u3053\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u65b0\u3057\u3044 IP \u30a2\u30c9\u30ec\u30b9\u3092\u53d6\u5f97\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f05fb9fb/client/WEB-INF/classes/resources/messages_nl_NL.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_nl_NL.properties b/client/WEB-INF/classes/resources/messages_nl_NL.properties
index b1bfadb..5d666a4 100644
--- a/client/WEB-INF/classes/resources/messages_nl_NL.properties
+++ b/client/WEB-INF/classes/resources/messages_nl_NL.properties
@@ -25,18 +25,18 @@ error.login=Uw gebruikersnaam/wachtwoord komt niet overeen met onze gegevens
error.menu.select=Kan actie niet uitvoeren omdat geen items zijn geselecteerd
error.mgmt.server.inaccessible=The Management Server is niet toegankelijk. Probeer het later opnieuw.
error.password.not.match=De wachtwoord velden komen niet overeen
-error.please.specify.physical.network.tags=Netwerk aanbiedingen zijn niet beschikbaar totdat u labels voor het fysieke netwerk specificeert.
+error.please.specify.physical.network.tags=Netwerk aanbiedingen zijn niet beschikbaar totdat u labels voor het fysieke netwerk specificeert.
error.session.expired=Uw sessie is verlopen
-error.something.went.wrong.please.correct.the.following=Er is iets mis gegaan; Corrigeer het volgende
+error.something.went.wrong.please.correct.the.following=Er is iets mis gegaan; Corrigeer het volgende
error.unable.to.reach.management.server=Niet in staat om de Management Server te bereiken
error.unresolved.internet.name=Uw internet naam kan niet worden omgezet.
extractable=Uitpakbaar
force.delete.domain.warning=Waarschuwing\: Wanneer u deze optie selecteert zullen alle onderliggende domeinen, hun gekoppelde accounts en hun verbruik worden verwijderd.
force.delete=Geforceerd verwijderen
force.remove=Geforceerd loskoppelen
-force.remove.host.warning=Waarschuwing\: Wanneer u deze optie selecteert zal CloudStack alle draaiende virtuele machines geforceerd stoppen voordat de host van het cluster wordt verwijderd.
+force.remove.host.warning=Waarschuwing\: Wanneer u deze optie selecteert zal CloudStack alle draaiende virtuele machines geforceerd stoppen voordat de host van het cluster wordt verwijderd.
force.stop=Geforceerd stoppen
-force.stop.instance.warning=Waarschuwing\: Een instantie geforceerd stoppen zou uw laatste optie moeten zijn. Het kan leiden tot dataverlies en inconsistent gedrag van de staat van de virtuele machine.
+force.stop.instance.warning=Waarschuwing\: Een instantie geforceerd stoppen zou uw laatste optie moeten zijn. Het kan leiden tot dataverlies en inconsistent gedrag van de staat van de virtuele machine.
ICMP.code=ICMP Code
ICMP.type=ICMP Type
image.directory=Afbeelding Directory
@@ -48,7 +48,7 @@ label.account.and.security.group=Account, Security group
label.account.id=Account ID
label.account.name=Account Naam
label.accounts=Accounts
-label.account.specific=Account-specifiek
+label.account.specific=Account-specifiek
label.acquire.new.ip=Bemachtig nieuw IP
label.action.attach.disk.processing=Schijf wordt toegevoegd....
label.action.attach.disk=Schijf toevoegen
@@ -65,12 +65,12 @@ label.action.copy.template=Kopieer Template
label.action.copy.template.processing=Bezig met kopi\u00ebren Template....
label.action.create.template=Cre\u00eber Template
label.action.create.template.from.vm=Cre\u00eber Template vanaf VM
-label.action.create.template.from.volume=Cre\u00eber Template van Volume
+label.action.create.template.from.volume=Cre\u00eber Template van Volume
label.action.create.template.processing=Bezig met aanmaken Template....
-label.action.create.vm=Cre\u00eber VM
+label.action.create.vm=Cre\u00eber VM
label.action.create.vm.processing=Bezig met aanmaken VM....
label.action.create.volume=Cre\u00eber Volume
-label.action.create.volume.processing=Bezig met cre\u00ebren volume....
+label.action.create.volume.processing=Bezig met cre\u00ebren volume....
label.action.delete.account.processing=Bezig met verwijderen account....
label.action.delete.account=Verwijder account
label.action.delete.cluster.processing=Bezig met verwijderen van Cluster....
@@ -81,7 +81,7 @@ label.action.delete.domain.processing=Bezig met verwijderen van Domein....
label.action.delete.domain=Verwijder Domein
label.action.delete.firewall.processing=Bezig met verwijderen van Firewall....
label.action.delete.firewall=Verwijder firewall regel
-label.action.delete.ingress.rule.processing=Bezig met verwijderen van Inkomende Regel....
+label.action.delete.ingress.rule.processing=Bezig met verwijderen van Inkomende Regel....
label.action.delete.ingress.rule=Verwijder Inkomende Regel
label.action.delete.IP.range.processing=Bezig met verwijderen van IP Range....
label.action.delete.IP.range=Verwijder IP Range
@@ -326,7 +326,7 @@ label.assign.to.load.balancer=Voeg instantie toe aan load balancer
label.associated.network=Bijbehorend Netwerk
label.associated.network.id=Bijbehorend Netwerk ID
label.attached.iso=Gekoppelde ISO
-label.author.email=Auteur e-mail
+label.author.email=Auteur e-mail
label.author.name=Auteur naam
label.availability=Beschikbaarheid
label.availability.zone=Beschikbaarheids-zone
@@ -450,7 +450,7 @@ label.disabled=Uitgeschakeld
label.disable.provider=Provider uitschakelen
label.disable.vpn=VPN uitschakelen
label.disabling.vpn.access=Uitschakelen van VPN Toegang
-label.disk.allocated=Schijfruimte gealloceerd
+label.disk.allocated=Schijfruimte gealloceerd
label.disk.offering=Schijf Aanbieding
label.disk.size.gb=Schijf Grootte (in GB)
label.disk.size=Schijf Grootte
@@ -471,7 +471,7 @@ label.domain.suffix=DNS domein achtervoegsel (v.b., xyz.com)
label.done=Klaar
label.double.quotes.are.not.allowed=Aanhalingstekens zijn hier niet toegestaan
label.download.progress=Download Voortgang
-label.drag.new.position=Sleep naar nieuwe positie
+label.drag.new.position=Sleep naar nieuwe positie
label.edit.lb.rule=Wijzig LB regel
label.edit.network.details=Wijzig netwerk details
label.edit.project.details=Wijzig project details
@@ -568,7 +568,7 @@ label.installWizard.addHostIntro.subtitle=Wat is een host?
label.installWizard.addHostIntro.title=Nu\: Host toevoegen
label.installWizard.addPodIntro.subtitle=Wat is een pod?
label.installWizard.addPodIntro.title=Nu\: Pod toevoegen
-label.installWizard.addPrimaryStorageIntro.subtitle=Wat is primary storage?
+label.installWizard.addPrimaryStorageIntro.subtitle=Wat is primary storage?
label.installWizard.addPrimaryStorageIntro.title=Nu\: Primaire opslag toevoegen
label.installWizard.addSecondaryStorageIntro.subtitle=Wat is secundaire opslag?
label.installWizard.addSecondaryStorageIntro.title=Nu\: Secundaire opslag toevoegen
@@ -620,7 +620,7 @@ label.keyboard.type=Toetsenbord type
label.key=Sleutel
label.kvm.traffic.label=KVM verkeer label
label.label=Label
-label.lang.brportugese=Braziliaans Portgees
+label.lang.brportugese=Braziliaans Portgees
label.lang.chinese=Chinees (Simplified)
label.lang.english=Engels
label.lang.french=Frans
@@ -793,7 +793,7 @@ label.number.of.system.vms=Aantal Systeem VMs
label.number.of.virtual.routers=Aantal Virtual Routers
label.number.of.zones=Aantal Zones
label.num.cpu.cores=Aantal CPU Cores
-label.numretries=Keren opnieuw geprorbeerd
+label.numretries=Keren opnieuw geprorbeerd
label.ocfs2=OCFS2
label.offer.ha=HA aanbieden
label.ok=OK
@@ -1156,24 +1156,24 @@ label.zones=Zones
label.zone.type=Type Zone
label.zone.wide=Zone breed
label.zoneWizard.trafficType.guest=Gast\: Verkeer tussen virtuele machines van de eindgebruiker
-label.zoneWizard.trafficType.public=Publiek\: Verkeer tussen het internet en virtueele machines in de cloud.
+label.zoneWizard.trafficType.public=Publiek\: Verkeer tussen het internet en virtueele machines in de cloud.
label.zoneWizard.trafficType.storage=Opslag\: Verkeer tussen de primaire en secundaire opslag servers zoals VM templates en snapshots
label.zone=Zone
managed.state=Beheersstaat
message.acquire.new.ip=Bevestigen dat je een nieuw IP voor dit netwerk wilt verkrijgen.
-message.acquire.new.ip.vpc=Bevestig dat u een nieuw IP wilt verkrijgen voor deze VPC.
+message.acquire.new.ip.vpc=Bevestig dat u een nieuw IP wilt verkrijgen voor deze VPC.
message.acquire.public.ip=Selecteer de zone waarvan u een nieuw IP wenst te verkrijgen.
-message.action.cancel.maintenance=Het onderhoud voor de host is succesvol geannuleerd. Het daadwerkelijke proces kan echter enkele minuten duren.
+message.action.cancel.maintenance=Het onderhoud voor de host is succesvol geannuleerd. Het daadwerkelijke proces kan echter enkele minuten duren.
message.action.cancel.maintenance.mode=Bevestig dat u het onderhoud wilt annuleren.
message.action.change.service.warning.for.instance=Uw instantie moet uitgeschakeld zijn voordat u de service aanbieding kunt wijzigen.
message.action.change.service.warning.for.router=Uw router moet uitgeschakeld zijn voordat u de service aanbieding kunt wijzigen.
message.action.delete.cluster=Bevestig dat u dit cluster wilt verwijderen.
message.action.delete.disk.offering=Bevestig dat u deze schijf aanbieding wilt verwijderen.
message.action.delete.domain=Bevestig dat u dit domein wilt verwijderen.
-message.action.delete.external.firewall=Bevestig dat u deze externe firewall wilt verwijderen. Waarschuwing\: Als u van plan bent dezelfde firewall opnieuw toe te voegen, dient u de verbruiksstatistieken eerst te resetten.
-message.action.delete.external.load.balancer=Bevestig dat u deze externe loadbalancer wilt verwijderen. Waarschuwing\: Als u van plan bent dezelfde loadbalancer opnieuw toe te voegen, dient u de verbruiksstatistieken eerst te resetten.
+message.action.delete.external.firewall=Bevestig dat u deze externe firewall wilt verwijderen. Waarschuwing\: Als u van plan bent dezelfde firewall opnieuw toe te voegen, dient u de verbruiksstatistieken eerst te resetten.
+message.action.delete.external.load.balancer=Bevestig dat u deze externe loadbalancer wilt verwijderen. Waarschuwing\: Als u van plan bent dezelfde loadbalancer opnieuw toe te voegen, dient u de verbruiksstatistieken eerst te resetten.
message.action.delete.ingress.rule=Bevestig dat u deze inkomende regel wilt verwijderen.
-message.action.delete.ISO=Bevestig dat u deze ISO wilt verwijderen.
+message.action.delete.ISO=Bevestig dat u deze ISO wilt verwijderen.
message.action.delete.ISO.for.all.zones=Deze ISO wordt gebruikt door alle zones. Bevestig dat u deze wilt verwijderen van alle zones.
message.action.delete.network=Bevestig dat u dit netwerk wilt verwijderen.
message.action.delete.nexusVswitch=Bevestig dat u deze nexus 1000v wilt verwijderen
@@ -1184,9 +1184,9 @@ message.action.delete.secondary.storage=Bevestig dat u deze secudaire opslag wil
message.action.delete.security.group=Bevestig dat u deze security group wilt verwijderen.
message.action.delete.service.offering=Bevestig dat u deze service aanbieding wilt verwijderen.
message.action.delete.snapshot=Bevestig dat u deze snapshot wilt verwijderen.
-message.action.delete.system.service.offering=Bevestig dat u deze systeem service aanbieding wilt verwijderen.
+message.action.delete.system.service.offering=Bevestig dat u deze systeem service aanbieding wilt verwijderen.
message.action.delete.template=Bevestig dat u deze template wilt verwijderen
-message.action.delete.template.for.all.zones=Deze template wordt gebruikt door alle zones. Bevestig dat u deze wilt verwijderen van alle zones.
+message.action.delete.template.for.all.zones=Deze template wordt gebruikt door alle zones. Bevestig dat u deze wilt verwijderen van alle zones.
message.action.delete.volume=Bevestig dat u dit volume wilt verwijderen
message.action.delete.zone=Bevestig dat u deze zone wilt verwijderen
message.action.destroy.instance=Bevestig dat u deze instantie wilt vernietigen
@@ -1200,13 +1200,13 @@ message.action.disable.zone=Bevestig dat u deze zone wilt uitschakelen.
message.action.download.iso=Bevestig dat u deze ISO wilt downloaden.
message.action.download.template=Bevestig dat u deze template wilt downloaden.
message.action.enable.cluster=Bevestig dat u dit cluster wilt inschakelen.
-message.action.enable.maintenance=Uw host is succesvol voorbereid op onderhoud. Het proces kan echter een paar minuten duren afhankelijk van de hoeveelheid VMs op de host.
+message.action.enable.maintenance=Uw host is succesvol voorbereid op onderhoud. Het proces kan echter een paar minuten duren afhankelijk van de hoeveelheid VMs op de host.
message.action.enable.nexusVswitch=Bevestig dat u deze nexus 1000v wilt inschakelen
message.action.enable.physical.network=Bevestig dat u dit fysieke netwerk wilt inschakelen.
message.action.enable.pod=Bevestigd dat u deze pod wilt inschakelen.
message.action.enable.zone=Bevestig dat u deze zone wilt inschakelen.
message.action.force.reconnect=De host is succesvol geforceerd om opnieuw te verbinden. Dit proces kan echter enkele minuten duren.
-message.action.host.enable.maintenance.mode=Het inschakelen van de onderhoudsmodus zorgt ervoor dat alle draaiende instanties worden gemigreerd naar andere beschikbare hosts.
+message.action.host.enable.maintenance.mode=Het inschakelen van de onderhoudsmodus zorgt ervoor dat alle draaiende instanties worden gemigreerd naar andere beschikbare hosts.
message.step.2.desc=
message.step.3.desc=
mode=Modus
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f05fb9fb/client/WEB-INF/classes/resources/messages_pl.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_pl.properties b/client/WEB-INF/classes/resources/messages_pl.properties
index 9024030..84808f8 100644
--- a/client/WEB-INF/classes/resources/messages_pl.properties
+++ b/client/WEB-INF/classes/resources/messages_pl.properties
@@ -37,7 +37,7 @@ label.action.create.vm.processing=Tworz\u0119 VM....
label.action.create.vm=Utw\u00f3rz VM
label.action.create.volume.processing=Tworz\u0119 wolumen....
label.action.create.volume=Utw\u00f3rz wolumen
-label.action.delete.account.processing=Usuwanie dost\u0119pu....
+label.action.delete.account.processing=Usuwanie dost\u0119pu....
label.action.delete.account=Usu\u0144 dost\u0119p
label.action.delete.cluster.processing=Usuwam klaster....
label.action.delete.cluster=Usu\u0144 klaster
@@ -160,7 +160,7 @@ label.adding.failed=Dodanie nieudane
label.adding.processing=Dodawanie
label.adding.succeeded=Dodanie udane
label.add.more=Dodaj wi\u0119cej
-label.add.network.device=Dodaj urz\u0105dzenie sieciowe
+label.add.network.device=Dodaj urz\u0105dzenie sieciowe
label.add.network=Dodaj sie\u0107
label.add.new.F5=Dodaj nowy F5
label.add.new.SRX=Dodaj nowy SRX
@@ -373,7 +373,7 @@ label.resource=Zas\u00f3b
label.restart.required=Wymagany restart
label.rules=Zasady
label.saturday=Sobota
-label.save.and.continue=Zapisz i kontynuuj
+label.save.and.continue=Zapisz i kontynuuj
label.save=Zapisz
label.saving.processing=Zapisywanie....
label.search=Szukaj
@@ -396,7 +396,7 @@ label.sticky.domain=Domena
label.sticky.expire=Wygasa
label.sticky.length=D\u0142ugo\u015b\u0107
label.sticky.mode=Tryb
-label.sticky.prefix=Prefiks
+label.sticky.prefix=Prefiks
label.stop=Stop
label.sunday=Niedziela
label.suspend.project=Zawie\u015b projekt
@@ -458,8 +458,8 @@ state.Creating=Tworzenie
state.Declined=Odrzucono
state.Destroyed=Zniszczono
state.Disabled=Wy\u0142\u0105czony
-state.enabled=W\u0142\u0105czone
-state.Enabled=W\u0142\u0105czone
+state.enabled=W\u0142\u0105czone
+state.Enabled=W\u0142\u0105czone
state.Error=B\u0142\u0105d
state.ready=Gotowe
state.Ready=Gotowe
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f05fb9fb/client/WEB-INF/classes/resources/messages_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_pt_BR.properties b/client/WEB-INF/classes/resources/messages_pt_BR.properties
index 07fd3f4..1bcdc9c 100644
--- a/client/WEB-INF/classes/resources/messages_pt_BR.properties
+++ b/client/WEB-INF/classes/resources/messages_pt_BR.properties
@@ -391,7 +391,7 @@ label.cpu.mhz=CPU (em MHz)
label.cpu.utilized=CPU Utilizada
label.created.by.system=Criado pelo sistema
label.created=Criado
-label.create.nfs.secondary.staging.store=Criar storage staging secund\u00e1rio NFS
+label.create.nfs.secondary.staging.store=Criar storage staging secund\u00e1rio NFS
label.create.project=Criar um projeto
label.create.template=Criar template
label.create.VPN.connection=Criar uma conex\u00e3o VPN
@@ -837,15 +837,12 @@ label.public.zone=Zona P\u00fablica
label.purpose=Prop\u00f3sito
label.Pxe.server.type=Tipo de Servidor PXE
label.quickview=Visualiza\u00e7\u00e3o r\u00e1pida
-<<<<<<< HEAD
-=======
label.quiesce.vm=Quiesce VM
label.rbd.id=Usu\u00e1rio Ceph
label.rbd.monitor=Monitor Ceph
label.rbd.pool=Pool Ceph
label.rbd=RDB
label.rbd.secret=Cephx secret
->>>>>>> 4e449ff... Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config
label.reboot=Reiniciar
label.recent.errors=Erros Recentes
label.redundant.router.capability=Recurso de roteador redundante
@@ -1101,12 +1098,9 @@ label.vm.state=Estado da VM
label.vm.stop=Parar
label.vms=VMs
label.vmware.traffic.label=Etiqueta de tr\u00e1fego VMware
-<<<<<<< HEAD
-=======
label.vnet.id=VLAN ID
label.vnet=VLAN
label.volatile=Vol\u00e1til
->>>>>>> 4e449ff... Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config
label.volgroup=Grupo de Volume
label.volume=Disco
label.volume.limits=Limites de Disco
@@ -1383,14 +1377,11 @@ message.please.select.a.different.public.and.management.network.before.removing=
message.please.select.networks=Por favor selecione as redes para sua m\u00e1quina virtual.
message.please.wait.while.zone.is.being.created=Por favor, espere enquanto sua zona est\u00e1 sendo criada; isto pode demorar um pouco...
message.project.invite.sent=Convite enviado para o usu\u00e1rio; Eles ser\u00e3o adicionados ao projeto ap\u00f3s aceitarem o convite
-<<<<<<< HEAD
-=======
message.public.traffic.in.advanced.zone=O tr\u00e1fego p\u00fablico \u00e9 gerado quando as VMs na nuvem acessam a internet. Os IPs acess\u00edveis ao p\u00fablico devem ser alocados para essa finalidade. Os usu\u00e1rios finais podem usar a interface do usu\u00e1rio CloudStack para adquirir esses IPs afim de implementar NAT entre a sua rede de guests e sua rede p\u00fablica. <br/><br/> Forne\u00e7a pelo menos um intervalo de endere\u00e7os IP para o tr\u00e1fego de internet.
message.public.traffic.in.basic.zone=O tr\u00e1fego p\u00fablico \u00e9 gerado quando as VMs na nuvem acessam a Internet ou prestam servi\u00e7os aos clientes atrav\u00e9s da Internet. Os IPs acess\u00edveis ao p\u00fablico devem ser alocados para essa finalidade. Quando uma inst\u00e2ncia \u00e9 criada, um IP a partir deste conjunto de IPs p\u00fablicos ser\u00e3o destinados \u00e0 inst\u00e2ncia, al\u00e9m do endere\u00e7o IP guest. Um NAT est\u00e1tico 1-1 ser\u00e1 criada automaticamente entre o IP p\u00fablico e IP guest. Os usu\u00e1rios finais tamb\u00e9m podem usar a interface de usu\u00e1rio CloudStack para adquirir IPs adicionais afim de se implementar NAT est\u00e1tico entre suas inst\u00e2ncias e o IP p\u00fablico.
message.redirecting.region=Redirecionando para regi\u00e3o...
message.remove.ldap=Voc\u00ea tem certeza que deseja deletar a configura\u00e7\u00e3o LDAP?
message.remove.region=Voc\u00ea tem certeza que deseja remover esta regi\u00e3o deste servidor de gerenciamento?
->>>>>>> 4e449ff... Add Dutch (Netherlands, Polish languages in Web UI Change Japanese code (ja -> ja_JP) Update transifex sync config
message.remove.vpc=Favor confirmar que voc\u00ea deseja remover a VPC
message.remove.vpn.access=Confirme se voc\u00ea deseja remover acesso VPN do seguinte Usu\u00e1rio.
message.reset.password.warning.notPasswordEnabled=O template desta inst\u00e2ncia foi criado sem senha habilitada
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f05fb9fb/client/WEB-INF/classes/resources/messages_zh_CN.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index 88b13a1..f4c206b 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -16,9 +16,7 @@
# under the License.
label.port=\u7aef\u53e3
label.remove.ldap=\u5220\u9664 LDAP
-message.remove.ldap=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664 LDAP \u914d\u7f6e?
label.configure.ldap=\u914d\u7f6e LDAP
-message.configure.ldap=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u914d\u7f6e LDAP\u3002
label.ldap.configuration=LDAP \u914d\u7f6e
label.ldap.port=LDAP \u7aef\u53e3
label.create.nfs.secondary.staging.store=\u521b\u5efa NFS \u8f85\u52a9\u6682\u5b58\u5b58\u50a8
@@ -1269,7 +1267,7 @@ label.zoneWizard.trafficType.management=\u7ba1\u7406\: CloudStack \u7684\u5185\u
label.zoneWizard.trafficType.public=\u516c\u7528\: \u4e91\u4e2d Internet \u4e0e\u865a\u62df\u673a\u4e4b\u95f4\u7684\u901a\u4fe1\u3002
label.zoneWizard.trafficType.storage=\u5b58\u50a8\: \u4e3b\u5b58\u50a8\u670d\u52a1\u5668\u4e0e\u8f85\u52a9\u5b58\u50a8\u670d\u52a1\u5668(\u4f8b\u5982 VM \u6a21\u677f\u4e0e\u5feb\u7167)\u4e4b\u95f4\u7684\u901a\u4fe1
label.ldap.group.name=LDAP \u7ec4
-label.password.reset.confirm=\u5bc6\u7801\u5df2\u91cd\u7f6e\u4e3a
+label.password.reset.confirm=\u5bc6\u7801\u5df2\u91cd\u7f6e\u4e3a
label.provider=\u63d0\u4f9b\u7a0b\u5e8f
label.resetVM=\u91cd\u7f6e VM
label.openDaylight=OpenDaylight
@@ -1319,15 +1317,6 @@ label.add.ucs.manager=\u6dfb\u52a0 UCS \u7ba1\u7406\u5668
label.ovm.traffic.label=OVM \u901a\u4fe1\u6807\u7b7e
label.lxc.traffic.label=LXC \u901a\u4fe1\u6807\u7b7e
label.hyperv.traffic.label=HyperV \u901a\u4fe1\u6807\u7b7e
-label.port=\u7aef\u53e3
-label.remove.ldap=\u5220\u9664 LDAP
-label.configure.ldap=\u914d\u7f6e LDAP
-label.ldap.configuration=LDAP \u914d\u7f6e
-label.ldap.port=LDAP \u7aef\u53e3
-label.create.nfs.secondary.staging.store=\u521b\u5efa NFS \u8f85\u52a9\u6682\u5b58\u5b58\u50a8
-label.volatile=\u53ef\u53d8
-label.planner.mode=\u89c4\u5212\u5668\u6a21\u5f0f
-label.deployment.planner=\u90e8\u7f72\u89c4\u5212\u5668
managed.state=\u6258\u7ba1\u72b6\u6001
message.acquire.new.ip.vpc=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e3a\u6b64 VPC \u83b7\u53d6\u4e00\u4e2a\u65b0 IP\u3002
message.acquire.new.ip=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e3a\u6b64\u7f51\u7edc\u83b7\u53d6\u4e00\u4e2a\u65b0 IP\u3002
[06/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VGPU.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VGPU.java b/deps/XenServerJava/src/com/xensource/xenapi/VGPU.java
index 19c88fd..ebd0a64 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VGPU.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VGPU.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VGPU extends XenAPIObject {
* For internal use only.
*/
VGPU(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VGPU extends XenAPIObject {
{
if (obj != null && obj instanceof VGPU)
{
- VGPU other = (VGPU)obj;
+ VGPU other = (VGPU) obj;
return other.ref.equals(this.ref);
} else
{
@@ -105,20 +106,24 @@ public class VGPU extends XenAPIObject {
print.printf("%1$20s: %2$s\n", "device", this.device);
print.printf("%1$20s: %2$s\n", "currentlyAttached", this.currentlyAttached);
print.printf("%1$20s: %2$s\n", "otherConfig", this.otherConfig);
+ print.printf("%1$20s: %2$s\n", "type", this.type);
+ print.printf("%1$20s: %2$s\n", "residentOn", this.residentOn);
return writer.toString();
}
/**
* Convert a VGPU.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("VM", this.VM == null ? new VM("OpaqueRef:NULL") : this.VM);
map.put("GPU_group", this.GPUGroup == null ? new GPUGroup("OpaqueRef:NULL") : this.GPUGroup);
map.put("device", this.device == null ? "" : this.device);
map.put("currently_attached", this.currentlyAttached == null ? false : this.currentlyAttached);
map.put("other_config", this.otherConfig == null ? new HashMap<String, String>() : this.otherConfig);
+ map.put("type", this.type == null ? new VGPUType("OpaqueRef:NULL") : this.type);
+ map.put("resident_on", this.residentOn == null ? new PGPU("OpaqueRef:NULL") : this.residentOn);
return map;
}
@@ -146,6 +151,14 @@ public class VGPU extends XenAPIObject {
* Additional configuration
*/
public Map<String, String> otherConfig;
+ /**
+ * Preset type for this VGPU
+ */
+ public VGPUType type;
+ /**
+ * The PGPU on which this VGPU is running
+ */
+ public PGPU residentOn;
}
/**
@@ -154,15 +167,15 @@ public class VGPU extends XenAPIObject {
* @return all fields from the object
*/
public VGPU.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVGPURecord(result);
+ return Types.toVGPURecord(result);
}
/**
@@ -172,15 +185,15 @@ public class VGPU extends XenAPIObject {
* @return reference to the object
*/
public static VGPU getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVGPU(result);
+ return Types.toVGPU(result);
}
/**
@@ -189,15 +202,15 @@ public class VGPU extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -206,15 +219,15 @@ public class VGPU extends XenAPIObject {
* @return value of the field
*/
public VM getVM(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.get_VM";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -223,15 +236,15 @@ public class VGPU extends XenAPIObject {
* @return value of the field
*/
public GPUGroup getGPUGroup(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.get_GPU_group";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toGPUGroup(result);
+ return Types.toGPUGroup(result);
}
/**
@@ -240,15 +253,15 @@ public class VGPU extends XenAPIObject {
* @return value of the field
*/
public String getDevice(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.get_device";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -257,15 +270,15 @@ public class VGPU extends XenAPIObject {
* @return value of the field
*/
public Boolean getCurrentlyAttached(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.get_currently_attached";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -274,15 +287,49 @@ public class VGPU extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
+ }
+
+ /**
+ * Get the type field of the given VGPU.
+ *
+ * @return value of the field
+ */
+ public VGPUType getType(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU.get_type";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toVGPUType(result);
+ }
+
+ /**
+ * Get the resident_on field of the given VGPU.
+ *
+ * @return value of the field
+ */
+ public PGPU getResidentOn(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU.get_resident_on";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toPGPU(result);
}
/**
@@ -291,9 +338,9 @@ public class VGPU extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -308,9 +355,9 @@ public class VGPU extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -324,9 +371,9 @@ public class VGPU extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -335,58 +382,58 @@ public class VGPU extends XenAPIObject {
}
/**
+ *
*
- *
- * @param VM
- * @param GPUGroup
- * @param device
- * @param otherConfig
+ * @param VM
+ * @param GPUGroup
+ * @param device
+ * @param otherConfig
+ * @param type
* @return Task
*/
- public static Task createAsync(Connection c, VM VM, GPUGroup GPUGroup, String device, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ public static Task createAsync(Connection c, VM VM, GPUGroup GPUGroup, String device, Map<String, String> otherConfig, VGPUType type) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VGPU.create";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(VM), Marshalling.toXMLRPC(GPUGroup), Marshalling.toXMLRPC(device),
- Marshalling.toXMLRPC(otherConfig)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(VM), Marshalling.toXMLRPC(GPUGroup), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(otherConfig), Marshalling.toXMLRPC(type)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
}
/**
+ *
*
- *
- * @param VM
- * @param GPUGroup
- * @param device
- * @param otherConfig
+ * @param VM
+ * @param GPUGroup
+ * @param device
+ * @param otherConfig
+ * @param type
* @return reference to the newly created object
*/
- public static VGPU create(Connection c, VM VM, GPUGroup GPUGroup, String device, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ public static VGPU create(Connection c, VM VM, GPUGroup GPUGroup, String device, Map<String, String> otherConfig, VGPUType type) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.create";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(VM), Marshalling.toXMLRPC(GPUGroup), Marshalling.toXMLRPC(device),
- Marshalling.toXMLRPC(otherConfig)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(VM), Marshalling.toXMLRPC(GPUGroup), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(otherConfig), Marshalling.toXMLRPC(type)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVGPU(result);
+ return Types.toVGPU(result);
}
/**
- *
+ *
*
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VGPU.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -396,13 +443,13 @@ public class VGPU extends XenAPIObject {
}
/**
- *
+ *
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -416,15 +463,15 @@ public class VGPU extends XenAPIObject {
* @return references to all objects
*/
public static Set<VGPU> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVGPU(result);
+ return Types.toSetOfVGPU(result);
}
/**
@@ -433,15 +480,15 @@ public class VGPU extends XenAPIObject {
* @return records of all objects
*/
public static Map<VGPU, VGPU.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VGPU.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVGPUVGPURecord(result);
+ return Types.toMapOfVGPUVGPURecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VGPUType.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VGPUType.java b/deps/XenServerJava/src/com/xensource/xenapi/VGPUType.java
new file mode 100644
index 0000000..075ec18
--- /dev/null
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VGPUType.java
@@ -0,0 +1,461 @@
+/*
+ * Copyright (c) Citrix Systems, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1) Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2) Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+package com.xensource.xenapi;
+
+import com.xensource.xenapi.Types.BadServerResponse;
+import com.xensource.xenapi.Types.VersionException;
+import com.xensource.xenapi.Types.XenAPIException;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.xmlrpc.XmlRpcException;
+
+/**
+ * A type of virtual GPU
+ *
+ * @author Citrix Systems, Inc.
+ */
+public class VGPUType extends XenAPIObject {
+
+ /**
+ * The XenAPI reference (OpaqueRef) to this object.
+ */
+ protected final String ref;
+
+ /**
+ * For internal use only.
+ */
+ VGPUType(String ref) {
+ this.ref = ref;
+ }
+
+ /**
+ * @return The XenAPI reference (OpaqueRef) to this object.
+ */
+ public String toWireString() {
+ return this.ref;
+ }
+
+ /**
+ * If obj is a VGPUType, compares XenAPI references for equality.
+ */
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj != null && obj instanceof VGPUType)
+ {
+ VGPUType other = (VGPUType) obj;
+ return other.ref.equals(this.ref);
+ } else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return ref.hashCode();
+ }
+
+ /**
+ * Represents all the fields in a VGPUType
+ */
+ public static class Record implements Types.Record {
+ public String toString() {
+ StringWriter writer = new StringWriter();
+ PrintWriter print = new PrintWriter(writer);
+ print.printf("%1$20s: %2$s\n", "uuid", this.uuid);
+ print.printf("%1$20s: %2$s\n", "vendorName", this.vendorName);
+ print.printf("%1$20s: %2$s\n", "modelName", this.modelName);
+ print.printf("%1$20s: %2$s\n", "framebufferSize", this.framebufferSize);
+ print.printf("%1$20s: %2$s\n", "maxHeads", this.maxHeads);
+ print.printf("%1$20s: %2$s\n", "maxResolutionX", this.maxResolutionX);
+ print.printf("%1$20s: %2$s\n", "maxResolutionY", this.maxResolutionY);
+ print.printf("%1$20s: %2$s\n", "supportedOnPGPUs", this.supportedOnPGPUs);
+ print.printf("%1$20s: %2$s\n", "enabledOnPGPUs", this.enabledOnPGPUs);
+ print.printf("%1$20s: %2$s\n", "VGPUs", this.VGPUs);
+ print.printf("%1$20s: %2$s\n", "supportedOnGPUGroups", this.supportedOnGPUGroups);
+ print.printf("%1$20s: %2$s\n", "enabledOnGPUGroups", this.enabledOnGPUGroups);
+ return writer.toString();
+ }
+
+ /**
+ * Convert a VGPU_type.Record to a Map
+ */
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
+ map.put("uuid", this.uuid == null ? "" : this.uuid);
+ map.put("vendor_name", this.vendorName == null ? "" : this.vendorName);
+ map.put("model_name", this.modelName == null ? "" : this.modelName);
+ map.put("framebuffer_size", this.framebufferSize == null ? 0 : this.framebufferSize);
+ map.put("max_heads", this.maxHeads == null ? 0 : this.maxHeads);
+ map.put("max_resolution_x", this.maxResolutionX == null ? 0 : this.maxResolutionX);
+ map.put("max_resolution_y", this.maxResolutionY == null ? 0 : this.maxResolutionY);
+ map.put("supported_on_PGPUs", this.supportedOnPGPUs == null ? new LinkedHashSet<PGPU>() : this.supportedOnPGPUs);
+ map.put("enabled_on_PGPUs", this.enabledOnPGPUs == null ? new LinkedHashSet<PGPU>() : this.enabledOnPGPUs);
+ map.put("VGPUs", this.VGPUs == null ? new LinkedHashSet<VGPU>() : this.VGPUs);
+ map.put("supported_on_GPU_groups", this.supportedOnGPUGroups == null ? new LinkedHashSet<GPUGroup>() : this.supportedOnGPUGroups);
+ map.put("enabled_on_GPU_groups", this.enabledOnGPUGroups == null ? new LinkedHashSet<GPUGroup>() : this.enabledOnGPUGroups);
+ return map;
+ }
+
+ /**
+ * Unique identifier/object reference
+ */
+ public String uuid;
+ /**
+ * Name of VGPU vendor
+ */
+ public String vendorName;
+ /**
+ * Model name associated with the VGPU type
+ */
+ public String modelName;
+ /**
+ * Framebuffer size of the VGPU type, in bytes
+ */
+ public Long framebufferSize;
+ /**
+ * Maximum number of displays supported by the VGPU type
+ */
+ public Long maxHeads;
+ /**
+ * Maximum resultion (width) supported by the VGPU type
+ */
+ public Long maxResolutionX;
+ /**
+ * Maximum resoltion (height) supported by the VGPU type
+ */
+ public Long maxResolutionY;
+ /**
+ * List of PGPUs that support this VGPU type
+ */
+ public Set<PGPU> supportedOnPGPUs;
+ /**
+ * List of PGPUs that have this VGPU type enabled
+ */
+ public Set<PGPU> enabledOnPGPUs;
+ /**
+ * List of VGPUs of this type
+ */
+ public Set<VGPU> VGPUs;
+ /**
+ * List of GPU groups in which at least one PGPU supports this VGPU type
+ */
+ public Set<GPUGroup> supportedOnGPUGroups;
+ /**
+ * List of GPU groups in which at least one have this VGPU type enabled
+ */
+ public Set<GPUGroup> enabledOnGPUGroups;
+ }
+
+ /**
+ * Get a record containing the current state of the given VGPU_type.
+ *
+ * @return all fields from the object
+ */
+ public VGPUType.Record getRecord(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_record";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toVGPUTypeRecord(result);
+ }
+
+ /**
+ * Get a reference to the VGPU_type instance with the specified UUID.
+ *
+ * @param uuid UUID of object to return
+ * @return reference to the object
+ */
+ public static VGPUType getByUuid(Connection c, String uuid) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_by_uuid";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toVGPUType(result);
+ }
+
+ /**
+ * Get the uuid field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public String getUuid(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_uuid";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toString(result);
+ }
+
+ /**
+ * Get the vendor_name field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public String getVendorName(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_vendor_name";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toString(result);
+ }
+
+ /**
+ * Get the model_name field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public String getModelName(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_model_name";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toString(result);
+ }
+
+ /**
+ * Get the framebuffer_size field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public Long getFramebufferSize(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_framebuffer_size";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toLong(result);
+ }
+
+ /**
+ * Get the max_heads field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public Long getMaxHeads(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_max_heads";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toLong(result);
+ }
+
+ /**
+ * Get the max_resolution_x field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public Long getMaxResolutionX(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_max_resolution_x";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toLong(result);
+ }
+
+ /**
+ * Get the max_resolution_y field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public Long getMaxResolutionY(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_max_resolution_y";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toLong(result);
+ }
+
+ /**
+ * Get the supported_on_PGPUs field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public Set<PGPU> getSupportedOnPGPUs(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_supported_on_PGPUs";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfPGPU(result);
+ }
+
+ /**
+ * Get the enabled_on_PGPUs field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public Set<PGPU> getEnabledOnPGPUs(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_enabled_on_PGPUs";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfPGPU(result);
+ }
+
+ /**
+ * Get the VGPUs field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public Set<VGPU> getVGPUs(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_VGPUs";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfVGPU(result);
+ }
+
+ /**
+ * Get the supported_on_GPU_groups field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public Set<GPUGroup> getSupportedOnGPUGroups(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_supported_on_GPU_groups";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfGPUGroup(result);
+ }
+
+ /**
+ * Get the enabled_on_GPU_groups field of the given VGPU_type.
+ *
+ * @return value of the field
+ */
+ public Set<GPUGroup> getEnabledOnGPUGroups(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_enabled_on_GPU_groups";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfGPUGroup(result);
+ }
+
+ /**
+ * Return a list of all the VGPU_types known to the system.
+ *
+ * @return references to all objects
+ */
+ public static Set<VGPUType> getAll(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_all";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toSetOfVGPUType(result);
+ }
+
+ /**
+ * Return a map of VGPU_type references to VGPU_type records for all VGPU_types known to the system.
+ *
+ * @return records of all objects
+ */
+ public static Map<VGPUType, VGPUType.Record> getAllRecords(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "VGPU_type.get_all_records";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toMapOfVGPUTypeVGPUTypeRecord(result);
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VIF.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VIF.java b/deps/XenServerJava/src/com/xensource/xenapi/VIF.java
index 8302800..c755dc4 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VIF.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VIF.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VIF extends XenAPIObject {
* For internal use only.
*/
VIF(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VIF extends XenAPIObject {
{
if (obj != null && obj instanceof VIF)
{
- VIF other = (VIF)obj;
+ VIF other = (VIF) obj;
return other.ref.equals(this.ref);
} else
{
@@ -126,8 +127,8 @@ public class VIF extends XenAPIObject {
/**
* Convert a VIF.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("allowed_operations", this.allowedOperations == null ? new LinkedHashSet<Types.VifOperations>() : this.allowedOperations);
map.put("current_operations", this.currentOperations == null ? new HashMap<String, Types.VifOperations>() : this.currentOperations);
@@ -146,7 +147,7 @@ public class VIF extends XenAPIObject {
map.put("qos_supported_algorithms", this.qosSupportedAlgorithms == null ? new LinkedHashSet<String>() : this.qosSupportedAlgorithms);
map.put("metrics", this.metrics == null ? new VIFMetrics("OpaqueRef:NULL") : this.metrics);
map.put("MAC_autogenerated", this.MACAutogenerated == null ? false : this.MACAutogenerated);
- map.put("locking_mode", this.lockingMode == null ? Types.VifLockingMode.UNRECOGNIZED : this.lockingMode);
+ map.put("locking_mode", this.lockingMode == null ? Types.VifLockingMode.NETWORK_DEFAULT : this.lockingMode);
map.put("ipv4_allowed", this.ipv4Allowed == null ? new LinkedHashSet<String>() : this.ipv4Allowed);
map.put("ipv6_allowed", this.ipv6Allowed == null ? new LinkedHashSet<String>() : this.ipv6Allowed);
return map;
@@ -244,15 +245,15 @@ public class VIF extends XenAPIObject {
* @return all fields from the object
*/
public VIF.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVIFRecord(result);
+ return Types.toVIFRecord(result);
}
/**
@@ -262,15 +263,15 @@ public class VIF extends XenAPIObject {
* @return reference to the object
*/
public static VIF getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVIF(result);
+ return Types.toVIF(result);
}
/**
@@ -280,9 +281,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, VIF.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -299,16 +300,16 @@ public class VIF extends XenAPIObject {
* @return reference to the newly created object
*/
public static VIF create(Connection c, VIF.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVIF(result);
+ return Types.toVIF(result);
}
/**
@@ -317,9 +318,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -333,9 +334,9 @@ public class VIF extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -349,15 +350,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -366,15 +367,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Set<Types.VifOperations> getAllowedOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_allowed_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVifOperations(result);
+ return Types.toSetOfVifOperations(result);
}
/**
@@ -383,15 +384,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Map<String, Types.VifOperations> getCurrentOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_current_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringVifOperations(result);
+ return Types.toMapOfStringVifOperations(result);
}
/**
@@ -400,15 +401,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public String getDevice(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_device";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -417,15 +418,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Network getNetwork(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_network";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toNetwork(result);
+ return Types.toNetwork(result);
}
/**
@@ -434,15 +435,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public VM getVM(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_VM";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -451,15 +452,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public String getMAC(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_MAC";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -468,15 +469,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Long getMTU(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_MTU";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -485,15 +486,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -502,15 +503,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Boolean getCurrentlyAttached(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_currently_attached";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -519,15 +520,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Long getStatusCode(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_status_code";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -536,15 +537,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public String getStatusDetail(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_status_detail";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -553,15 +554,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getRuntimeProperties(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_runtime_properties";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -570,15 +571,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public String getQosAlgorithmType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_qos_algorithm_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -587,15 +588,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getQosAlgorithmParams(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_qos_algorithm_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -604,15 +605,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Set<String> getQosSupportedAlgorithms(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_qos_supported_algorithms";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -621,15 +622,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public VIFMetrics getMetrics(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_metrics";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVIFMetrics(result);
+ return Types.toVIFMetrics(result);
}
/**
@@ -638,15 +639,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Boolean getMACAutogenerated(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_MAC_autogenerated";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -655,15 +656,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Types.VifLockingMode getLockingMode(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_locking_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVifLockingMode(result);
+ return Types.toVifLockingMode(result);
}
/**
@@ -672,15 +673,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Set<String> getIpv4Allowed(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_ipv4_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -689,15 +690,15 @@ public class VIF extends XenAPIObject {
* @return value of the field
*/
public Set<String> getIpv6Allowed(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_ipv6_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -706,9 +707,9 @@ public class VIF extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -723,9 +724,9 @@ public class VIF extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -739,9 +740,9 @@ public class VIF extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -755,9 +756,9 @@ public class VIF extends XenAPIObject {
* @param algorithmType New value to set
*/
public void setQosAlgorithmType(Connection c, String algorithmType) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.set_qos_algorithm_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(algorithmType)};
@@ -771,9 +772,9 @@ public class VIF extends XenAPIObject {
* @param algorithmParams New value to set
*/
public void setQosAlgorithmParams(Connection c, Map<String, String> algorithmParams) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.set_qos_algorithm_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(algorithmParams)};
@@ -788,9 +789,9 @@ public class VIF extends XenAPIObject {
* @param value Value to add
*/
public void addToQosAlgorithmParams(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.add_to_qos_algorithm_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -804,9 +805,9 @@ public class VIF extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromQosAlgorithmParams(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.remove_from_qos_algorithm_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -820,9 +821,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task plugAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.plug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -836,9 +837,9 @@ public class VIF extends XenAPIObject {
*
*/
public void plug(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.plug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -852,9 +853,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task unplugAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.unplug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -868,9 +869,9 @@ public class VIF extends XenAPIObject {
*
*/
public void unplug(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.unplug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -884,9 +885,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task unplugForceAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.unplug_force";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -900,9 +901,9 @@ public class VIF extends XenAPIObject {
*
*/
public void unplugForce(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.unplug_force";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -917,9 +918,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task setLockingModeAsync(Connection c, Types.VifLockingMode value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.set_locking_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -934,9 +935,9 @@ public class VIF extends XenAPIObject {
* @param value The new locking mode for the VIF
*/
public void setLockingMode(Connection c, Types.VifLockingMode value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.set_locking_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -951,9 +952,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task setIpv4AllowedAsync(Connection c, Set<String> value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.set_ipv4_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -968,9 +969,9 @@ public class VIF extends XenAPIObject {
* @param value The IP addresses which will be associated with the VIF
*/
public void setIpv4Allowed(Connection c, Set<String> value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.set_ipv4_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -985,9 +986,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task addIpv4AllowedAsync(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.add_ipv4_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1002,9 +1003,9 @@ public class VIF extends XenAPIObject {
* @param value The IP address which will be associated with the VIF
*/
public void addIpv4Allowed(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.add_ipv4_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1019,9 +1020,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task removeIpv4AllowedAsync(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.remove_ipv4_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1036,9 +1037,9 @@ public class VIF extends XenAPIObject {
* @param value The IP address which will be removed from the VIF
*/
public void removeIpv4Allowed(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.remove_ipv4_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1053,9 +1054,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task setIpv6AllowedAsync(Connection c, Set<String> value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.set_ipv6_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1070,9 +1071,9 @@ public class VIF extends XenAPIObject {
* @param value The IP addresses which will be associated with the VIF
*/
public void setIpv6Allowed(Connection c, Set<String> value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.set_ipv6_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1087,9 +1088,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task addIpv6AllowedAsync(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.add_ipv6_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1104,9 +1105,9 @@ public class VIF extends XenAPIObject {
* @param value The IP address which will be associated with the VIF
*/
public void addIpv6Allowed(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.add_ipv6_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1121,9 +1122,9 @@ public class VIF extends XenAPIObject {
* @return Task
*/
public Task removeIpv6AllowedAsync(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VIF.remove_ipv6_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1138,9 +1139,9 @@ public class VIF extends XenAPIObject {
* @param value The IP address which will be removed from the VIF
*/
public void removeIpv6Allowed(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.remove_ipv6_allowed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1154,15 +1155,15 @@ public class VIF extends XenAPIObject {
* @return references to all objects
*/
public static Set<VIF> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVIF(result);
+ return Types.toSetOfVIF(result);
}
/**
@@ -1171,15 +1172,15 @@ public class VIF extends XenAPIObject {
* @return records of all objects
*/
public static Map<VIF, VIF.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVIFVIFRecord(result);
+ return Types.toMapOfVIFVIFRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VIFMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VIFMetrics.java b/deps/XenServerJava/src/com/xensource/xenapi/VIFMetrics.java
index 0c17217..c051e53 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VIFMetrics.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VIFMetrics.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VIFMetrics extends XenAPIObject {
* For internal use only.
*/
VIFMetrics(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VIFMetrics extends XenAPIObject {
{
if (obj != null && obj instanceof VIFMetrics)
{
- VIFMetrics other = (VIFMetrics)obj;
+ VIFMetrics other = (VIFMetrics) obj;
return other.ref.equals(this.ref);
} else
{
@@ -110,8 +111,8 @@ public class VIFMetrics extends XenAPIObject {
/**
* Convert a VIF_metrics.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("io_read_kbs", this.ioReadKbs == null ? 0.0 : this.ioReadKbs);
map.put("io_write_kbs", this.ioWriteKbs == null ? 0.0 : this.ioWriteKbs);
@@ -148,15 +149,15 @@ public class VIFMetrics extends XenAPIObject {
* @return all fields from the object
*/
public VIFMetrics.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVIFMetricsRecord(result);
+ return Types.toVIFMetricsRecord(result);
}
/**
@@ -166,15 +167,15 @@ public class VIFMetrics extends XenAPIObject {
* @return reference to the object
*/
public static VIFMetrics getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVIFMetrics(result);
+ return Types.toVIFMetrics(result);
}
/**
@@ -183,15 +184,15 @@ public class VIFMetrics extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -200,15 +201,15 @@ public class VIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Double getIoReadKbs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.get_io_read_kbs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDouble(result);
+ return Types.toDouble(result);
}
/**
@@ -217,15 +218,15 @@ public class VIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Double getIoWriteKbs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.get_io_write_kbs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDouble(result);
+ return Types.toDouble(result);
}
/**
@@ -234,15 +235,15 @@ public class VIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Date getLastUpdated(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.get_last_updated";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -251,15 +252,15 @@ public class VIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -268,9 +269,9 @@ public class VIFMetrics extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -285,9 +286,9 @@ public class VIFMetrics extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -301,9 +302,9 @@ public class VIFMetrics extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -317,15 +318,15 @@ public class VIFMetrics extends XenAPIObject {
* @return references to all objects
*/
public static Set<VIFMetrics> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVIFMetrics(result);
+ return Types.toSetOfVIFMetrics(result);
}
/**
@@ -334,15 +335,15 @@ public class VIFMetrics extends XenAPIObject {
* @return records of all objects
*/
public static Map<VIFMetrics, VIFMetrics.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VIF_metrics.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVIFMetricsVIFMetricsRecord(result);
+ return Types.toMapOfVIFMetricsVIFMetricsRecord(result);
}
}
\ No newline at end of file
[30/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
NetUtils testing
- Refactor tests:
- Upgrade tests to use jUnit4
- Add hamcrest dependency (contribution of by Laszio Hornyak)
- Break big tests in small unit tests
- Replace assertTrue/False with complex conditions by assertThat with
specific matchers
- Remove dead code:
- Private static method never called locally
- Add test for method that validates cidrs
Signed-off-by: Laszlo Hornyak <la...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef547108
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef547108
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef547108
Branch: refs/heads/acl-item-cidrs
Commit: ef547108dde9257422ac66a3de5868c93890968c
Parents: 169cd6f
Author: miguelaferreira <mf...@shubergphilis.com>
Authored: Fri Feb 21 17:18:23 2014 +0100
Committer: Laszlo Hornyak <la...@gmail.com>
Committed: Tue Feb 25 19:23:13 2014 +0100
----------------------------------------------------------------------
pom.xml | 10 +-
utils/src/com/cloud/utils/net/NetUtils.java | 15 +-
.../test/com/cloud/utils/net/NetUtilsTest.java | 227 +++++++++++++------
3 files changed, 168 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef547108/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c0b8219..02b1808 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,9 @@
<cs.logging.version>1.1.1</cs.logging.version>
<cs.discovery.version>0.5</cs.discovery.version>
<cs.ejb.version>3.0</cs.ejb.version>
- <cs.junit.version>4.10</cs.junit.version>
+ <!-- do not forget to also upgrade hamcrest library with junit -->
+ <cs.junit.version>4.11</cs.junit.version>
+ <cs.hamcrest.version>1.3</cs.hamcrest.version>
<cs.bcprov.version>1.46</cs.bcprov.version>
<cs.jsch.version>0.1.42</cs.jsch.version>
<cs.jpa.version>2.0.0</cs.jpa.version>
@@ -414,6 +416,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>${cs.hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef547108/utils/src/com/cloud/utils/net/NetUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index c22e39a..6350986 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -44,13 +44,12 @@ import org.apache.commons.lang.SystemUtils;
import org.apache.commons.net.util.SubnetUtils;
import org.apache.log4j.Logger;
-import com.googlecode.ipv6.IPv6Address;
-import com.googlecode.ipv6.IPv6AddressRange;
-import com.googlecode.ipv6.IPv6Network;
-
import com.cloud.utils.IteratorUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.script.Script;
+import com.googlecode.ipv6.IPv6Address;
+import com.googlecode.ipv6.IPv6AddressRange;
+import com.googlecode.ipv6.IPv6Network;
public class NetUtils {
protected final static Logger s_logger = Logger.getLogger(NetUtils.class);
@@ -158,14 +157,6 @@ public class NetUtils {
return cidrList.toArray(new String[0]);
}
- private static boolean isWindows() {
- String os = System.getProperty("os.name");
- if (os != null && os.startsWith("Windows"))
- return true;
-
- return false;
- }
-
public static String getDefaultHostIp() {
if (SystemUtils.IS_OS_WINDOWS) {
Pattern pattern = Pattern.compile("\\s*0.0.0.0\\s*0.0.0.0\\s*(\\S*)\\s*(\\S*)\\s*");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef547108/utils/test/com/cloud/utils/net/NetUtilsTest.java
----------------------------------------------------------------------
diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java
index d3e283c..3183826 100644
--- a/utils/test/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java
@@ -19,54 +19,90 @@
package com.cloud.utils.net;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import java.math.BigInteger;
-import java.net.URI;
import java.util.SortedSet;
import java.util.TreeSet;
-import junit.framework.TestCase;
-
import org.apache.log4j.Logger;
import org.junit.Test;
import com.googlecode.ipv6.IPv6Address;
-public class NetUtilsTest extends TestCase {
+public class NetUtilsTest {
private static final Logger s_logger = Logger.getLogger(NetUtilsTest.class);
@Test
- public void testGetRandomIpFromCidr() {
+ public void testGetRandomIpFromCidrWithSize24() throws Exception {
+ String cidr = "192.168.124.1";
+ int size = 24;
+ int netCharacters = 12;
+
+ long ip = NetUtils.getRandomIpFromCidr(cidr, size, new TreeSet<Long>());
+
+ assertThat("The ip " + NetUtils.long2Ip(ip) + " retrieved must be within the cidr " + cidr + "/" + size, cidr.substring(0, netCharacters), equalTo(NetUtils.long2Ip(ip)
+ .substring(0, netCharacters)));
+ }
+
+ @Test
+ public void testGetRandomIpFromCidrWithSize16() throws Exception {
+ String cidr = "192.168.124.1";
+ int size = 16;
+ int netCharacters = 8;
+
+ long ip = NetUtils.getRandomIpFromCidr(cidr, 16, new TreeSet<Long>());
+
+ assertThat("The ip " + NetUtils.long2Ip(ip) + " retrieved must be within the cidr " + cidr + "/" + size, cidr.substring(0, netCharacters), equalTo(NetUtils.long2Ip(ip)
+ .substring(0, netCharacters)));
+ }
+
+ @Test
+ public void testGetRandomIpFromCidrWithSize8() throws Exception {
String cidr = "192.168.124.1";
- long ip = NetUtils.getRandomIpFromCidr(cidr, 24, new TreeSet<Long>());
- assertEquals("The ip " + NetUtils.long2Ip(ip) + " retrieved must be within the cidr " + cidr + "/24", cidr.substring(0, 12), NetUtils.long2Ip(ip)
- .substring(0, 12));
+ int size = 8;
+ int netCharacters = 4;
- ip = NetUtils.getRandomIpFromCidr(cidr, 16, new TreeSet<Long>());
- assertEquals("The ip " + NetUtils.long2Ip(ip) + " retrieved must be within the cidr " + cidr + "/16", cidr.substring(0, 8), NetUtils.long2Ip(ip).substring(0, 8));
+ long ip = NetUtils.getRandomIpFromCidr(cidr, 16, new TreeSet<Long>());
- ip = NetUtils.getRandomIpFromCidr(cidr, 8, new TreeSet<Long>());
- assertEquals("The ip " + NetUtils.long2Ip(ip) + " retrieved must be within the cidr " + cidr + "/8", cidr.substring(0, 4), NetUtils.long2Ip(ip).substring(0, 4));
+ assertThat("The ip " + NetUtils.long2Ip(ip) + " retrieved must be within the cidr " + cidr + "/" + size, cidr.substring(0, netCharacters), equalTo(NetUtils.long2Ip(ip)
+ .substring(0, netCharacters)));
+ }
+
+ @Test
+ public void testGetRandomIpFromCidrUsignAvoid() throws Exception {
+ String cidr = "192.168.124.1";
+ int size = 30;
SortedSet<Long> avoid = new TreeSet<Long>();
- ip = NetUtils.getRandomIpFromCidr(cidr, 30, avoid);
- assertTrue("We should be able to retrieve an ip on the first call.", ip != -1);
+ long ip = NetUtils.getRandomIpFromCidr(cidr, size, avoid);
+ assertThat("We should be able to retrieve an ip on the first call.", ip, not(equalTo(-1L)));
avoid.add(ip);
- ip = NetUtils.getRandomIpFromCidr(cidr, 30, avoid);
- assertTrue("We should be able to retrieve an ip on the second call.", ip != -1);
- assertTrue("ip returned is not in the avoid list", !avoid.contains(ip));
+ ip = NetUtils.getRandomIpFromCidr(cidr, size, avoid);
+ assertThat("We should be able to retrieve an ip on the second call.", ip, not(equalTo(-1L)));
+ assertThat("ip returned is not in the avoid list", avoid, not(contains(ip)));
avoid.add(ip);
- ip = NetUtils.getRandomIpFromCidr(cidr, 30, avoid);
- assertTrue("We should be able to retrieve an ip on the third call.", ip != -1);
- assertTrue("ip returned is not in the avoid list", !avoid.contains(ip));
+ ip = NetUtils.getRandomIpFromCidr(cidr, size, avoid);
+ assertThat("We should be able to retrieve an ip on the third call.", ip, not(equalTo(-1L)));
+ assertThat("ip returned is not in the avoid list", avoid, not(contains(ip)));
avoid.add(ip);
-
- ip = NetUtils.getRandomIpFromCidr(cidr, 30, avoid);
+ ip = NetUtils.getRandomIpFromCidr(cidr, size, avoid);
assertEquals("This should be -1 because we ran out of ip addresses: " + ip, ip, -1);
}
@Test
- public void testVpnPolicy() {
+ public void testIsValidS2SVpnPolicy() {
assertTrue(NetUtils.isValidS2SVpnPolicy("aes128-sha1"));
assertTrue(NetUtils.isValidS2SVpnPolicy("3des-sha1"));
assertTrue(NetUtils.isValidS2SVpnPolicy("3des-sha1,aes256-sha1"));
@@ -81,22 +117,12 @@ public class NetUtilsTest extends TestCase {
assertFalse(NetUtils.isValidS2SVpnPolicy(",aes;modp1536,,,"));
}
- public void testIpv6() {
- assertTrue(NetUtils.isValidIpv6("fc00::1"));
- assertFalse(NetUtils.isValidIpv6(""));
- assertFalse(NetUtils.isValidIpv6(null));
- assertFalse(NetUtils.isValidIpv6("1234:5678::1/64"));
- assertTrue(NetUtils.isValidIp6Cidr("1234:5678::1/64"));
- assertFalse(NetUtils.isValidIp6Cidr("1234:5678::1"));
- assertEquals(NetUtils.getIp6CidrSize("1234:5678::1/32"), 32);
- assertEquals(NetUtils.getIp6CidrSize("1234:5678::1"), 0);
- BigInteger two = new BigInteger("2");
- assertEquals(NetUtils.countIp6InRange("1234:5678::1-1234:5678::2"), two);
- assertEquals(NetUtils.countIp6InRange("1234:5678::2-1234:5678::0"), null);
+ @Test
+ public void testGetIp6FromRange() {
assertEquals(NetUtils.getIp6FromRange("1234:5678::1-1234:5678::1"), "1234:5678::1");
for (int i = 0; i < 5; i++) {
String ip = NetUtils.getIp6FromRange("1234:5678::1-1234:5678::2");
- assertTrue(ip.equals("1234:5678::1") || ip.equals("1234:5678::2"));
+ assertThat(ip, anyOf(equalTo("1234:5678::1"), equalTo("1234:5678::2")));
s_logger.info("IP is " + ip);
}
String ipString = null;
@@ -106,49 +132,104 @@ public class NetUtilsTest extends TestCase {
ipString = NetUtils.getIp6FromRange(ipStart.toString() + "-" + ipEnd.toString());
s_logger.info("IP is " + ipString);
IPv6Address ip = IPv6Address.fromString(ipString);
- assertTrue(ip.compareTo(ipStart) >= 0);
- assertTrue(ip.compareTo(ipEnd) <= 0);
+ assertThat(ip, greaterThanOrEqualTo(ipStart));
+ assertThat(ip, lessThanOrEqualTo(ipEnd));
}
- //Test isIp6RangeOverlap
- assertFalse(NetUtils.isIp6RangeOverlap("1234:5678::1-1234:5678::ffff", "1234:5678:1::1-1234:5678:1::ffff"));
- assertTrue(NetUtils.isIp6RangeOverlap("1234:5678::1-1234:5678::ffff", "1234:5678::2-1234:5678::f"));
- assertTrue(NetUtils.isIp6RangeOverlap("1234:5678::f-1234:5678::ffff", "1234:5678::2-1234:5678::f"));
- assertFalse(NetUtils.isIp6RangeOverlap("1234:5678::f-1234:5678::ffff", "1234:5678::2-1234:5678::e"));
- assertFalse(NetUtils.isIp6RangeOverlap("1234:5678::f-1234:5678::f", "1234:5678::2-1234:5678::e"));
- //Test getNextIp6InRange
+ }
+
+ @Test
+ public void testCountIp6InRange() {
+ assertEquals(NetUtils.countIp6InRange("1234:5678::1-1234:5678::2"), new BigInteger("2"));
+ assertEquals(NetUtils.countIp6InRange("1234:5678::2-1234:5678::0"), null);
+ }
+
+ @Test
+ public void testGetIp6CidrSize() {
+ assertEquals(NetUtils.getIp6CidrSize("1234:5678::1/32"), 32);
+ assertEquals(NetUtils.getIp6CidrSize("1234:5678::1"), 0);
+ }
+
+ @Test
+ public void testIsValidIp6Cidr() {
+ assertTrue(NetUtils.isValidIp6Cidr("1234:5678::1/64"));
+ assertFalse(NetUtils.isValidIp6Cidr("1234:5678::1"));
+ }
+
+ @Test
+ public void testIsValidIpv6() {
+ assertTrue(NetUtils.isValidIpv6("fc00::1"));
+ assertFalse(NetUtils.isValidIpv6(""));
+ assertFalse(NetUtils.isValidIpv6(null));
+ assertFalse(NetUtils.isValidIpv6("1234:5678::1/64"));
+ }
+
+ @Test
+ public void testIsIp6InRange() {
+ assertTrue(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678:abcd::1-1234:5678:abcd::1"));
+ assertFalse(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678:abcd::2-1234:5678:abcd::1"));
+ assertFalse(NetUtils.isIp6InRange("1234:5678:abcd::1", null));
+ assertTrue(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678::1-1234:5679::1"));
+ }
+
+ @Test
+ public void testIsIp6InNetwork() {
+ assertFalse(NetUtils.isIp6InNetwork("1234:5678:abcd::1", "1234:5678::/64"));
+ assertTrue(NetUtils.isIp6InNetwork("1234:5678::1", "1234:5678::/64"));
+ assertTrue(NetUtils.isIp6InNetwork("1234:5678::ffff:ffff:ffff:ffff", "1234:5678::/64"));
+ assertTrue(NetUtils.isIp6InNetwork("1234:5678::", "1234:5678::/64"));
+ }
+
+ @Test
+ public void testGetNextIp6InRange() {
String range = "1234:5678::1-1234:5678::8000:0000";
assertEquals(NetUtils.getNextIp6InRange("1234:5678::8000:0", range), "1234:5678::1");
assertEquals(NetUtils.getNextIp6InRange("1234:5678::7fff:ffff", range), "1234:5678::8000:0");
assertEquals(NetUtils.getNextIp6InRange("1234:5678::1", range), "1234:5678::2");
range = "1234:5678::1-1234:5678::ffff:ffff:ffff:ffff";
assertEquals(NetUtils.getNextIp6InRange("1234:5678::ffff:ffff:ffff:ffff", range), "1234:5678::1");
- //Test isIp6InNetwork
- assertFalse(NetUtils.isIp6InNetwork("1234:5678:abcd::1", "1234:5678::/64"));
- assertTrue(NetUtils.isIp6InNetwork("1234:5678::1", "1234:5678::/64"));
- assertTrue(NetUtils.isIp6InNetwork("1234:5678::ffff:ffff:ffff:ffff", "1234:5678::/64"));
- assertTrue(NetUtils.isIp6InNetwork("1234:5678::", "1234:5678::/64"));
- //Test isIp6InRange
- assertTrue(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678:abcd::1-1234:5678:abcd::1"));
- assertFalse(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678:abcd::2-1234:5678:abcd::1"));
- assertFalse(NetUtils.isIp6InRange("1234:5678:abcd::1", null));
- assertTrue(NetUtils.isIp6InRange("1234:5678:abcd::1", "1234:5678::1-1234:5679::1"));
}
- public void testPvlan() {
- URI uri = NetUtils.generateUriForPvlan("123", "456");
- assertTrue(uri.toString().equals("pvlan://123-i456"));
- assertTrue(NetUtils.getPrimaryPvlanFromUri(uri).equals("123"));
- assertTrue(NetUtils.getIsolatedPvlanFromUri(uri).equals("456"));
+ @Test
+ public void testIsIp6RangeOverlap() {
+ assertFalse(NetUtils.isIp6RangeOverlap("1234:5678::1-1234:5678::ffff", "1234:5678:1::1-1234:5678:1::ffff"));
+ assertTrue(NetUtils.isIp6RangeOverlap("1234:5678::1-1234:5678::ffff", "1234:5678::2-1234:5678::f"));
+ assertTrue(NetUtils.isIp6RangeOverlap("1234:5678::f-1234:5678::ffff", "1234:5678::2-1234:5678::f"));
+ assertFalse(NetUtils.isIp6RangeOverlap("1234:5678::f-1234:5678::ffff", "1234:5678::2-1234:5678::e"));
+ assertFalse(NetUtils.isIp6RangeOverlap("1234:5678::f-1234:5678::f", "1234:5678::2-1234:5678::e"));
}
- public void testIsSameIpRange() {
- //Test to check IP Range of 2 CIDRs
+ @Test
+ public void testGenerateUriForPvlan() {
+ assertEquals("pvlan://123-i456", NetUtils.generateUriForPvlan("123", "456").toString());
+ }
+
+ @Test
+ public void testGetPrimaryPvlanFromUri() {
+ assertEquals("123", NetUtils.getPrimaryPvlanFromUri(NetUtils.generateUriForPvlan("123", "456")));
+ }
+
+ @Test
+ public void testGetIsolatedPvlanFromUri() {
+ assertEquals("456", NetUtils.getIsolatedPvlanFromUri(NetUtils.generateUriForPvlan("123", "456")));
+ }
+
+ @Test
+ public void testIsValidCIDR() throws Exception {
+ //Test to check IP Range of 2 CIDR
String cidrFirst = "10.0.144.0/20";
String cidrSecond = "10.0.151.0/20";
String cidrThird = "10.0.144.0/21";
+
assertTrue(NetUtils.isValidCIDR(cidrFirst));
assertTrue(NetUtils.isValidCIDR(cidrSecond));
assertTrue(NetUtils.isValidCIDR(cidrThird));
+ }
+
+ @Test
+ public void testIsSameIpRange() {
+ String cidrFirst = "10.0.144.0/20";
+ String cidrSecond = "10.0.151.0/20";
+ String cidrThird = "10.0.144.0/21";
//Check for exactly same CIDRs
assertTrue(NetUtils.isSameIpRange(cidrFirst, cidrFirst));
@@ -160,17 +241,14 @@ public class NetUtilsTest extends TestCase {
assertFalse(NetUtils.isSameIpRange(cidrFirst, "10.3.6.5/50"));
}
- public void testMacGenerateion() {
+ @Test
+ public void testGenerateMacOnIncrease() {
String mac = "06:01:23:00:45:67";
- String newMac = NetUtils.generateMacOnIncrease(mac, 2);
- assertTrue(newMac.equals("06:01:25:00:45:67"));
- newMac = NetUtils.generateMacOnIncrease(mac, 16);
- assertTrue(newMac.equals("06:01:33:00:45:67"));
+ assertEquals("06:01:25:00:45:67", NetUtils.generateMacOnIncrease(mac, 2));
+ assertEquals("06:01:33:00:45:67", NetUtils.generateMacOnIncrease(mac, 16));
mac = "06:ff:ff:00:45:67";
- newMac = NetUtils.generateMacOnIncrease(mac, 1);
- assertTrue(newMac.equals("06:00:00:00:45:67"));
- newMac = NetUtils.generateMacOnIncrease(mac, 16);
- assertTrue(newMac.equals("06:00:0f:00:45:67"));
+ assertEquals("06:00:00:00:45:67", NetUtils.generateMacOnIncrease(mac, 1));
+ assertEquals("06:00:0f:00:45:67", NetUtils.generateMacOnIncrease(mac, 16));
}
@Test
@@ -187,4 +265,11 @@ public class NetUtilsTest extends TestCase {
assertFalse(NetUtils.isSameIsolationId("2", "vlan://3"));
assertFalse(NetUtils.isSameIsolationId("bla", null));
}
+
+ @Test
+ public void testValidateGuestCidr() throws Exception {
+ String guestCidr = "192.168.1.0/24";
+
+ assertTrue(NetUtils.validateGuestCidr(guestCidr));
+ }
}
[20/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
CLOUDSTACK-6058: XenServer 6.2sp1 xenapi customization as per CloudStack resource code.
Signed-off-by: Hugo Trippaers <ht...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/505da760
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/505da760
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/505da760
Branch: refs/heads/acl-item-cidrs
Commit: 505da760e065450f52f3a22649bd648af8f9c854
Parents: 2ff9aba
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Wed Jan 22 16:25:30 2014 +0530
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 25 08:56:58 2014 +0100
----------------------------------------------------------------------
.../src/com/xensource/xenapi/Connection.java | 12 +++++++----
.../src/com/xensource/xenapi/Event.java | 15 ++++++++++++++
.../src/com/xensource/xenapi/VDI.java | 21 ++++++++++++++++++++
3 files changed, 44 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/505da760/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Connection.java b/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
index 63469df..661724f 100755
--- a/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
@@ -58,6 +58,8 @@ public class Connection
private APIVersion apiVersion;
+ protected int _wait = 600;
+
/**
* Updated when Session.login_with_password() is called.
*/
@@ -142,10 +144,10 @@ public class Connection
* When this constructor is used, a call to dispose() will do nothing. The programmer is responsible for manually
* logging out the Session.
*/
- public Connection(URL url)
+ public Connection(URL url, int wait)
{
deprecatedConstructorUsed = false;
-
+ _wait = wait;
this.client = getClientFromURL(url);
}
@@ -257,6 +259,8 @@ public class Connection
{
config.setTimeZone(TimeZone.getTimeZone("UTC"));
config.setServerURL(url);
+ config.setReplyTimeout(_wait * 1000);
+ config.setConnectionTimeout(5000);
XmlRpcClient client = new XmlRpcClient();
client.setConfig(config);
return client;
@@ -276,7 +280,7 @@ public class Connection
/**
* The (auto-generated parts of) the bindings dispatch XMLRPC calls on this Connection's client through this method.
*/
- Map dispatch(String method_call, Object[] method_params) throws XmlRpcException, XenAPIException
+ protected Map dispatch(String method_call, Object[] method_params) throws XmlRpcException, XenAPIException
{
Map response = (Map) client.execute(method_call, method_params);
@@ -320,7 +324,7 @@ public class Connection
new Connection(new URL(client_url.getProtocol(),
(String)error[1],
client_url.getPort(),
- client_url.getFile()));
+ client_url.getFile()), _wait);
tmp_conn.sessionReference = sessionReference;
try
{
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/505da760/deps/XenServerJava/src/com/xensource/xenapi/Event.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Event.java b/deps/XenServerJava/src/com/xensource/xenapi/Event.java
index 3014ba0..27db4a5 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Event.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Event.java
@@ -301,4 +301,19 @@ public class Event extends XenAPIObject {
return Types.toString(result);
}
+ public static Map properFrom(Connection c, Set<String> classes, String token, Double timeout) throws BadServerResponse, XenAPIException, XmlRpcException,
+ Types.SessionNotRegistered,
+ Types.EventsLost {
+ String method_call = "event.from";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(classes), Marshalling.toXMLRPC(token), Marshalling.toXMLRPC(timeout)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ Map value = (Map)result;
+ Map<String, Object> from = new HashMap<String, Object>();
+ from.put("token", value.get("token"));
+ from.put("events", Types.toSetOfEventRecord(value.get("events")));
+ return from;
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/505da760/deps/XenServerJava/src/com/xensource/xenapi/VDI.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VDI.java b/deps/XenServerJava/src/com/xensource/xenapi/VDI.java
index cf8d3ec..1431ce0 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VDI.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VDI.java
@@ -1470,6 +1470,27 @@ public class VDI extends XenAPIObject {
}
/**
+ * Copy either a full VDI or the block differences between two VDIs into either a fresh VDI or an existing VDI.
+ *
+ * @param sr The destination SR (only required if the destination VDI is not specified
+ * @param baseVdi The base VDI (only required if copying only changed blocks, by default all blocks will be copied)
+ * @param intoVdi The destination VDI to copy blocks into (if omitted then a destination SR must be provided and a fresh VDI will be created)
+ * @return Task
+ */
+ public Task copyAsync2(Connection c, SR sr, VDI baseVdi, VDI intoVdi) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VdiReadonly {
+ String method_call = "Async.VDI.copy";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(sr), Marshalling.toXMLRPC(baseVdi), Marshalling.toXMLRPC(intoVdi)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toTask(result);
+ }
+
+ /**
* Make a fresh VDI in the specified SR and copy the supplied VDI's data to the new disk
*
* @param sr The destination SR
[28/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to
e90d595
Posted by da...@apache.org.
Forward port the fix by David from 0c2ad0338e34f6117cecc24ec00c7746dd481465
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/afc188cb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/afc188cb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/afc188cb
Branch: refs/heads/acl-item-cidrs
Commit: afc188cb5c72e316975799c95529e8692ddcb94b
Parents: 3a7e410
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Feb 25 15:17:16 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 25 15:18:16 2014 +0100
----------------------------------------------------------------------
client/tomcatconf/catalina.properties.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/afc188cb/client/tomcatconf/catalina.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/catalina.properties.in b/client/tomcatconf/catalina.properties.in
index dc2db35..ce03ff6 100644
--- a/client/tomcatconf/catalina.properties.in
+++ b/client/tomcatconf/catalina.properties.in
@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar
#
# List of comma-separated paths defining the contents of the "server"
[14/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/PIF.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/PIF.java b/deps/XenServerJava/src/com/xensource/xenapi/PIF.java
index 27618b4..e75b565 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/PIF.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/PIF.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class PIF extends XenAPIObject {
* For internal use only.
*/
PIF(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class PIF extends XenAPIObject {
{
if (obj != null && obj instanceof PIF)
{
- PIF other = (PIF)obj;
+ PIF other = (PIF) obj;
return other.ref.equals(this.ref);
} else
{
@@ -127,14 +128,15 @@ public class PIF extends XenAPIObject {
print.printf("%1$20s: %2$s\n", "IPv6", this.IPv6);
print.printf("%1$20s: %2$s\n", "ipv6Gateway", this.ipv6Gateway);
print.printf("%1$20s: %2$s\n", "primaryAddressType", this.primaryAddressType);
+ print.printf("%1$20s: %2$s\n", "managed", this.managed);
return writer.toString();
}
/**
* Convert a PIF.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("device", this.device == null ? "" : this.device);
map.put("network", this.network == null ? new Network("OpaqueRef:NULL") : this.network);
@@ -163,6 +165,7 @@ public class PIF extends XenAPIObject {
map.put("IPv6", this.IPv6 == null ? new LinkedHashSet<String>() : this.IPv6);
map.put("ipv6_gateway", this.ipv6Gateway == null ? "" : this.ipv6Gateway);
map.put("primary_address_type", this.primaryAddressType == null ? Types.PrimaryAddressType.UNRECOGNIZED : this.primaryAddressType);
+ map.put("managed", this.managed == null ? false : this.managed);
return map;
}
@@ -278,6 +281,10 @@ public class PIF extends XenAPIObject {
* Which protocol should define the primary address of this interface
*/
public Types.PrimaryAddressType primaryAddressType;
+ /**
+ * Indicates whether the interface is managed by xapi. If it is not, then xapi will not configure the interface, the commands PIF.plug/unplug/reconfigure_ip(v6) can not be used, nor can the interface be bonded or have VLANs based on top through xapi.
+ */
+ public Boolean managed;
}
/**
@@ -286,15 +293,15 @@ public class PIF extends XenAPIObject {
* @return all fields from the object
*/
public PIF.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIFRecord(result);
+ return Types.toPIFRecord(result);
}
/**
@@ -304,15 +311,15 @@ public class PIF extends XenAPIObject {
* @return reference to the object
*/
public static PIF getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
@@ -321,15 +328,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -338,15 +345,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public String getDevice(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_device";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -355,15 +362,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Network getNetwork(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_network";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toNetwork(result);
+ return Types.toNetwork(result);
}
/**
@@ -372,15 +379,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Host getHost(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_host";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -389,15 +396,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public String getMAC(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_MAC";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -406,15 +413,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Long getMTU(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_MTU";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -423,15 +430,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Long getVLAN(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_VLAN";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -440,15 +447,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public PIFMetrics getMetrics(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_metrics";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIFMetrics(result);
+ return Types.toPIFMetrics(result);
}
/**
@@ -457,15 +464,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Boolean getPhysical(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_physical";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -474,15 +481,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Boolean getCurrentlyAttached(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_currently_attached";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -491,15 +498,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Types.IpConfigurationMode getIpConfigurationMode(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_ip_configuration_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toIpConfigurationMode(result);
+ return Types.toIpConfigurationMode(result);
}
/**
@@ -508,15 +515,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public String getIP(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_IP";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -525,15 +532,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public String getNetmask(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_netmask";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -542,15 +549,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public String getGateway(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_gateway";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -559,15 +566,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public String getDNS(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_DNS";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -576,15 +583,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Bond getBondSlaveOf(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_bond_slave_of";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBond(result);
+ return Types.toBond(result);
}
/**
@@ -593,15 +600,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Set<Bond> getBondMasterOf(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_bond_master_of";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfBond(result);
+ return Types.toSetOfBond(result);
}
/**
@@ -610,15 +617,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public VLAN getVLANMasterOf(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_VLAN_master_of";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVLAN(result);
+ return Types.toVLAN(result);
}
/**
@@ -627,15 +634,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Set<VLAN> getVLANSlaveOf(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_VLAN_slave_of";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVLAN(result);
+ return Types.toSetOfVLAN(result);
}
/**
@@ -644,15 +651,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Boolean getManagement(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_management";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -661,15 +668,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -678,15 +685,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Boolean getDisallowUnplug(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_disallow_unplug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -695,15 +702,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Set<Tunnel> getTunnelAccessPIFOf(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_tunnel_access_PIF_of";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfTunnel(result);
+ return Types.toSetOfTunnel(result);
}
/**
@@ -712,15 +719,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Set<Tunnel> getTunnelTransportPIFOf(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_tunnel_transport_PIF_of";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfTunnel(result);
+ return Types.toSetOfTunnel(result);
}
/**
@@ -729,15 +736,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Types.Ipv6ConfigurationMode getIpv6ConfigurationMode(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_ipv6_configuration_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toIpv6ConfigurationMode(result);
+ return Types.toIpv6ConfigurationMode(result);
}
/**
@@ -746,15 +753,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Set<String> getIPv6(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_IPv6";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -763,15 +770,15 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public String getIpv6Gateway(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_ipv6_gateway";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -780,15 +787,32 @@ public class PIF extends XenAPIObject {
* @return value of the field
*/
public Types.PrimaryAddressType getPrimaryAddressType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_primary_address_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPrimaryAddressType(result);
+ return Types.toPrimaryAddressType(result);
+ }
+
+ /**
+ * Get the managed field of the given PIF.
+ *
+ * @return value of the field
+ */
+ public Boolean getManaged(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "PIF.get_managed";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toBoolean(result);
}
/**
@@ -797,9 +821,9 @@ public class PIF extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -814,9 +838,9 @@ public class PIF extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -830,9 +854,9 @@ public class PIF extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -846,9 +870,9 @@ public class PIF extends XenAPIObject {
* @param disallowUnplug New value to set
*/
public void setDisallowUnplug(Connection c, Boolean disallowUnplug) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.set_disallow_unplug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(disallowUnplug)};
@@ -866,16 +890,14 @@ public class PIF extends XenAPIObject {
* @param VLAN VLAN tag for the new interface
* @return Task
*/
- @Deprecated
- public static Task createVLANAsync(Connection c, String device, Network network, Host host, Long VLAN) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VlanTagInvalid {
+ @Deprecated public static Task createVLANAsync(Connection c, String device, Network network, Host host, Long VLAN) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VlanTagInvalid {
String method_call = "Async.PIF.create_VLAN";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(host),
- Marshalling.toXMLRPC(VLAN)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(VLAN)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -891,19 +913,17 @@ public class PIF extends XenAPIObject {
* @param VLAN VLAN tag for the new interface
* @return The reference of the created PIF object
*/
- @Deprecated
- public static PIF createVLAN(Connection c, String device, Network network, Host host, Long VLAN) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.VlanTagInvalid {
+ @Deprecated public static PIF createVLAN(Connection c, String device, Network network, Host host, Long VLAN) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.VlanTagInvalid {
String method_call = "PIF.create_VLAN";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(host),
- Marshalling.toXMLRPC(VLAN)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(VLAN)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
@@ -912,12 +932,11 @@ public class PIF extends XenAPIObject {
*
* @return Task
*/
- @Deprecated
- public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.PifIsPhysical {
+ @Deprecated public Task destroyAsync(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.PifIsPhysical {
String method_call = "Async.PIF.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -931,12 +950,11 @@ public class PIF extends XenAPIObject {
* @deprecated
*
*/
- @Deprecated
- public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.PifIsPhysical {
+ @Deprecated public void destroy(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.PifIsPhysical {
String method_call = "PIF.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -955,13 +973,12 @@ public class PIF extends XenAPIObject {
* @return Task
*/
public Task reconfigureIpAsync(Connection c, Types.IpConfigurationMode mode, String IP, String netmask, String gateway, String DNS) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PIF.reconfigure_ip";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(IP),
- Marshalling.toXMLRPC(netmask), Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(IP), Marshalling.toXMLRPC(netmask), Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -977,13 +994,12 @@ public class PIF extends XenAPIObject {
* @param DNS the new DNS settings
*/
public void reconfigureIp(Connection c, Types.IpConfigurationMode mode, String IP, String netmask, String gateway, String DNS) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.reconfigure_ip";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(IP),
- Marshalling.toXMLRPC(netmask), Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(IP), Marshalling.toXMLRPC(netmask), Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS)};
Map response = c.dispatch(method_call, method_params);
return;
}
@@ -998,13 +1014,12 @@ public class PIF extends XenAPIObject {
* @return Task
*/
public Task reconfigureIpv6Async(Connection c, Types.Ipv6ConfigurationMode mode, String IPv6, String gateway, String DNS) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PIF.reconfigure_ipv6";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(IPv6),
- Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(IPv6), Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1019,13 +1034,12 @@ public class PIF extends XenAPIObject {
* @param DNS the new DNS settings
*/
public void reconfigureIpv6(Connection c, Types.Ipv6ConfigurationMode mode, String IPv6, String gateway, String DNS) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.reconfigure_ipv6";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(IPv6),
- Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(IPv6), Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS)};
Map response = c.dispatch(method_call, method_params);
return;
}
@@ -1037,9 +1051,9 @@ public class PIF extends XenAPIObject {
* @return Task
*/
public Task setPrimaryAddressTypeAsync(Connection c, Types.PrimaryAddressType primaryAddressType) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PIF.set_primary_address_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(primaryAddressType)};
@@ -1054,9 +1068,9 @@ public class PIF extends XenAPIObject {
* @param primaryAddressType Whether to prefer IPv4 or IPv6 connections
*/
public void setPrimaryAddressType(Connection c, Types.PrimaryAddressType primaryAddressType) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.set_primary_address_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(primaryAddressType)};
@@ -1071,9 +1085,9 @@ public class PIF extends XenAPIObject {
* @return Task
*/
public static Task scanAsync(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PIF.scan";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host)};
@@ -1088,9 +1102,9 @@ public class PIF extends XenAPIObject {
* @param host The host on which to scan
*/
public static void scan(Connection c, Host host) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.scan";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host)};
@@ -1104,15 +1118,16 @@ public class PIF extends XenAPIObject {
* @param host The host on which the interface exists
* @param MAC The MAC address of the interface
* @param device The device name to use for the interface
+ * @param managed Indicates whether the interface is managed by xapi (defaults to "true")
* @return Task
*/
- public static Task introduceAsync(Connection c, Host host, String MAC, String device) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ public static Task introduceAsync(Connection c, Host host, String MAC, String device, Boolean managed) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PIF.introduce";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(device)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(managed)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1124,18 +1139,19 @@ public class PIF extends XenAPIObject {
* @param host The host on which the interface exists
* @param MAC The MAC address of the interface
* @param device The device name to use for the interface
+ * @param managed Indicates whether the interface is managed by xapi (defaults to "true")
* @return The reference of the created PIF object
*/
- public static PIF introduce(Connection c, Host host, String MAC, String device) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ public static PIF introduce(Connection c, Host host, String MAC, String device, Boolean managed) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.introduce";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(device)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(managed)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
@@ -1144,10 +1160,10 @@ public class PIF extends XenAPIObject {
* @return Task
*/
public Task forgetAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.PifTunnelStillExists {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.PifTunnelStillExists {
String method_call = "Async.PIF.forget";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1161,10 +1177,10 @@ public class PIF extends XenAPIObject {
*
*/
public void forget(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.PifTunnelStillExists {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.PifTunnelStillExists {
String method_call = "PIF.forget";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1178,9 +1194,9 @@ public class PIF extends XenAPIObject {
* @return Task
*/
public Task unplugAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PIF.unplug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1194,9 +1210,9 @@ public class PIF extends XenAPIObject {
*
*/
public void unplug(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.unplug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1210,10 +1226,10 @@ public class PIF extends XenAPIObject {
* @return Task
*/
public Task plugAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.TransportPifNotConfigured {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.TransportPifNotConfigured {
String method_call = "Async.PIF.plug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1227,10 +1243,10 @@ public class PIF extends XenAPIObject {
*
*/
public void plug(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.TransportPifNotConfigured {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.TransportPifNotConfigured {
String method_call = "PIF.plug";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1241,43 +1257,37 @@ public class PIF extends XenAPIObject {
/**
* Create a new PIF record in the database only
*
- * @param device
- * @param network
- * @param host
- * @param MAC
- * @param MTU
- * @param VLAN
- * @param physical
- * @param ipConfigurationMode
- * @param IP
- * @param netmask
- * @param gateway
- * @param DNS
- * @param bondSlaveOf
- * @param VLANMasterOf
- * @param management
- * @param otherConfig
- * @param disallowUnplug
- * @param ipv6ConfigurationMode
- * @param IPv6
- * @param ipv6Gateway
- * @param primaryAddressType
+ * @param device
+ * @param network
+ * @param host
+ * @param MAC
+ * @param MTU
+ * @param VLAN
+ * @param physical
+ * @param ipConfigurationMode
+ * @param IP
+ * @param netmask
+ * @param gateway
+ * @param DNS
+ * @param bondSlaveOf
+ * @param VLANMasterOf
+ * @param management
+ * @param otherConfig
+ * @param disallowUnplug
+ * @param ipv6ConfigurationMode
+ * @param IPv6
+ * @param ipv6Gateway
+ * @param primaryAddressType
+ * @param managed
* @return Task
*/
- public static Task dbIntroduceAsync(Connection c, String device, Network network, Host host, String MAC, Long MTU, Long VLAN, Boolean physical,
- Types.IpConfigurationMode ipConfigurationMode, String IP, String netmask, String gateway, String DNS, Bond bondSlaveOf, VLAN VLANMasterOf, Boolean management,
- Map<String, String> otherConfig, Boolean disallowUnplug, Types.Ipv6ConfigurationMode ipv6ConfigurationMode, Set<String> IPv6, String ipv6Gateway,
- Types.PrimaryAddressType primaryAddressType) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ public static Task dbIntroduceAsync(Connection c, String device, Network network, Host host, String MAC, Long MTU, Long VLAN, Boolean physical, Types.IpConfigurationMode ipConfigurationMode, String IP, String netmask, String gateway, String DNS, Bond bondSlaveOf, VLAN VLANMasterOf, Boolean management, Map<String, String> otherConfig, Boolean disallowUnplug, Types.Ipv6ConfigurationMode ipv6ConfigurationMode, Set<String> IPv6, String ipv6Gateway, Types.PrimaryAddressType primaryAddressType, Boolean managed) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PIF.db_introduce";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(host),
- Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(MTU), Marshalling.toXMLRPC(VLAN), Marshalling.toXMLRPC(physical), Marshalling.toXMLRPC(ipConfigurationMode),
- Marshalling.toXMLRPC(IP), Marshalling.toXMLRPC(netmask), Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS), Marshalling.toXMLRPC(bondSlaveOf),
- Marshalling.toXMLRPC(VLANMasterOf), Marshalling.toXMLRPC(management), Marshalling.toXMLRPC(otherConfig), Marshalling.toXMLRPC(disallowUnplug),
- Marshalling.toXMLRPC(ipv6ConfigurationMode), Marshalling.toXMLRPC(IPv6), Marshalling.toXMLRPC(ipv6Gateway), Marshalling.toXMLRPC(primaryAddressType)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(MTU), Marshalling.toXMLRPC(VLAN), Marshalling.toXMLRPC(physical), Marshalling.toXMLRPC(ipConfigurationMode), Marshalling.toXMLRPC(IP), Marshalling.toXMLRPC(netmask), Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS), Marshalling.toXMLRPC(bondSlaveOf), Marshalling.toXMLRPC(VLANMasterOf), Marshalling.toXMLRPC(management), Marshalling.toXMLRPC(otherConfig), Marshalling.toXMLRPC(disallowUnplug), Marshalling.toXMLRPC(ipv6ConfigurationMode), Marshalling.toXMLRPC(IPv6), Marshalling.toXMLRPC(ipv6Gateway), Marshalling.toXMLRPC(primaryAddressType), Marshalling.toXMLRPC(managed)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
return Types.toTask(result);
@@ -1286,46 +1296,40 @@ public class PIF extends XenAPIObject {
/**
* Create a new PIF record in the database only
*
- * @param device
- * @param network
- * @param host
- * @param MAC
- * @param MTU
- * @param VLAN
- * @param physical
- * @param ipConfigurationMode
- * @param IP
- * @param netmask
- * @param gateway
- * @param DNS
- * @param bondSlaveOf
- * @param VLANMasterOf
- * @param management
- * @param otherConfig
- * @param disallowUnplug
- * @param ipv6ConfigurationMode
- * @param IPv6
- * @param ipv6Gateway
- * @param primaryAddressType
+ * @param device
+ * @param network
+ * @param host
+ * @param MAC
+ * @param MTU
+ * @param VLAN
+ * @param physical
+ * @param ipConfigurationMode
+ * @param IP
+ * @param netmask
+ * @param gateway
+ * @param DNS
+ * @param bondSlaveOf
+ * @param VLANMasterOf
+ * @param management
+ * @param otherConfig
+ * @param disallowUnplug
+ * @param ipv6ConfigurationMode
+ * @param IPv6
+ * @param ipv6Gateway
+ * @param primaryAddressType
+ * @param managed
* @return The ref of the newly created PIF record.
*/
- public static PIF dbIntroduce(Connection c, String device, Network network, Host host, String MAC, Long MTU, Long VLAN, Boolean physical,
- Types.IpConfigurationMode ipConfigurationMode, String IP, String netmask, String gateway, String DNS, Bond bondSlaveOf, VLAN VLANMasterOf, Boolean management,
- Map<String, String> otherConfig, Boolean disallowUnplug, Types.Ipv6ConfigurationMode ipv6ConfigurationMode, Set<String> IPv6, String ipv6Gateway,
- Types.PrimaryAddressType primaryAddressType) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ public static PIF dbIntroduce(Connection c, String device, Network network, Host host, String MAC, Long MTU, Long VLAN, Boolean physical, Types.IpConfigurationMode ipConfigurationMode, String IP, String netmask, String gateway, String DNS, Bond bondSlaveOf, VLAN VLANMasterOf, Boolean management, Map<String, String> otherConfig, Boolean disallowUnplug, Types.Ipv6ConfigurationMode ipv6ConfigurationMode, Set<String> IPv6, String ipv6Gateway, Types.PrimaryAddressType primaryAddressType, Boolean managed) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.db_introduce";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(host),
- Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(MTU), Marshalling.toXMLRPC(VLAN), Marshalling.toXMLRPC(physical), Marshalling.toXMLRPC(ipConfigurationMode),
- Marshalling.toXMLRPC(IP), Marshalling.toXMLRPC(netmask), Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS), Marshalling.toXMLRPC(bondSlaveOf),
- Marshalling.toXMLRPC(VLANMasterOf), Marshalling.toXMLRPC(management), Marshalling.toXMLRPC(otherConfig), Marshalling.toXMLRPC(disallowUnplug),
- Marshalling.toXMLRPC(ipv6ConfigurationMode), Marshalling.toXMLRPC(IPv6), Marshalling.toXMLRPC(ipv6Gateway), Marshalling.toXMLRPC(primaryAddressType)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(device), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(host), Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(MTU), Marshalling.toXMLRPC(VLAN), Marshalling.toXMLRPC(physical), Marshalling.toXMLRPC(ipConfigurationMode), Marshalling.toXMLRPC(IP), Marshalling.toXMLRPC(netmask), Marshalling.toXMLRPC(gateway), Marshalling.toXMLRPC(DNS), Marshalling.toXMLRPC(bondSlaveOf), Marshalling.toXMLRPC(VLANMasterOf), Marshalling.toXMLRPC(management), Marshalling.toXMLRPC(otherConfig), Marshalling.toXMLRPC(disallowUnplug), Marshalling.toXMLRPC(ipv6ConfigurationMode), Marshalling.toXMLRPC(IPv6), Marshalling.toXMLRPC(ipv6Gateway), Marshalling.toXMLRPC(primaryAddressType), Marshalling.toXMLRPC(managed)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
@@ -1334,9 +1338,9 @@ public class PIF extends XenAPIObject {
* @return Task
*/
public Task dbForgetAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.PIF.db_forget";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1350,9 +1354,9 @@ public class PIF extends XenAPIObject {
*
*/
public void dbForget(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.db_forget";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1366,15 +1370,15 @@ public class PIF extends XenAPIObject {
* @return references to all objects
*/
public static Set<PIF> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPIF(result);
+ return Types.toSetOfPIF(result);
}
/**
@@ -1383,15 +1387,15 @@ public class PIF extends XenAPIObject {
* @return records of all objects
*/
public static Map<PIF, PIF.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfPIFPIFRecord(result);
+ return Types.toMapOfPIFPIFRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/PIFMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/PIFMetrics.java b/deps/XenServerJava/src/com/xensource/xenapi/PIFMetrics.java
index ab6268e..7d15393 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/PIFMetrics.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/PIFMetrics.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class PIFMetrics extends XenAPIObject {
* For internal use only.
*/
PIFMetrics(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class PIFMetrics extends XenAPIObject {
{
if (obj != null && obj instanceof PIFMetrics)
{
- PIFMetrics other = (PIFMetrics)obj;
+ PIFMetrics other = (PIFMetrics) obj;
return other.ref.equals(this.ref);
} else
{
@@ -118,8 +119,8 @@ public class PIFMetrics extends XenAPIObject {
/**
* Convert a PIF_metrics.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("io_read_kbs", this.ioReadKbs == null ? 0.0 : this.ioReadKbs);
map.put("io_write_kbs", this.ioWriteKbs == null ? 0.0 : this.ioWriteKbs);
@@ -196,15 +197,15 @@ public class PIFMetrics extends XenAPIObject {
* @return all fields from the object
*/
public PIFMetrics.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIFMetricsRecord(result);
+ return Types.toPIFMetricsRecord(result);
}
/**
@@ -214,15 +215,15 @@ public class PIFMetrics extends XenAPIObject {
* @return reference to the object
*/
public static PIFMetrics getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIFMetrics(result);
+ return Types.toPIFMetrics(result);
}
/**
@@ -231,15 +232,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -248,15 +249,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Double getIoReadKbs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_io_read_kbs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDouble(result);
+ return Types.toDouble(result);
}
/**
@@ -265,15 +266,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Double getIoWriteKbs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_io_write_kbs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDouble(result);
+ return Types.toDouble(result);
}
/**
@@ -282,15 +283,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Boolean getCarrier(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_carrier";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -299,15 +300,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public String getVendorId(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_vendor_id";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -316,15 +317,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public String getVendorName(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_vendor_name";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -333,15 +334,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public String getDeviceId(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_device_id";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -350,15 +351,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public String getDeviceName(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_device_name";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -367,15 +368,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Long getSpeed(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_speed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -384,15 +385,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Boolean getDuplex(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_duplex";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -401,15 +402,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public String getPciBusPath(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_pci_bus_path";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -418,15 +419,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Date getLastUpdated(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_last_updated";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -435,15 +436,15 @@ public class PIFMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -452,9 +453,9 @@ public class PIFMetrics extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -469,9 +470,9 @@ public class PIFMetrics extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -485,9 +486,9 @@ public class PIFMetrics extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -501,15 +502,15 @@ public class PIFMetrics extends XenAPIObject {
* @return references to all objects
*/
public static Set<PIFMetrics> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPIFMetrics(result);
+ return Types.toSetOfPIFMetrics(result);
}
/**
@@ -518,15 +519,15 @@ public class PIFMetrics extends XenAPIObject {
* @return records of all objects
*/
public static Map<PIFMetrics, PIFMetrics.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "PIF_metrics.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfPIFMetricsPIFMetricsRecord(result);
+ return Types.toMapOfPIFMetricsPIFMetricsRecord(result);
}
}
\ No newline at end of file
[17/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Host.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Host.java b/deps/XenServerJava/src/com/xensource/xenapi/Host.java
index 2195048..0bbae11 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Host.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Host.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Host extends XenAPIObject {
* For internal use only.
*/
Host(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Host extends XenAPIObject {
{
if (obj != null && obj instanceof Host)
{
- Host other = (Host)obj;
+ Host other = (Host) obj;
return other.ref.equals(this.ref);
} else
{
@@ -146,14 +147,15 @@ public class Host extends XenAPIObject {
print.printf("%1$20s: %2$s\n", "chipsetInfo", this.chipsetInfo);
print.printf("%1$20s: %2$s\n", "PCIs", this.PCIs);
print.printf("%1$20s: %2$s\n", "PGPUs", this.PGPUs);
+ print.printf("%1$20s: %2$s\n", "guestVCPUsParams", this.guestVCPUsParams);
return writer.toString();
}
/**
* Convert a host.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -163,8 +165,7 @@ public class Host extends XenAPIObject {
map.put("API_version_major", this.APIVersionMajor == null ? 0 : this.APIVersionMajor);
map.put("API_version_minor", this.APIVersionMinor == null ? 0 : this.APIVersionMinor);
map.put("API_version_vendor", this.APIVersionVendor == null ? "" : this.APIVersionVendor);
- map.put("API_version_vendor_implementation", this.APIVersionVendorImplementation == null ? new HashMap<String, String>()
- : this.APIVersionVendorImplementation);
+ map.put("API_version_vendor_implementation", this.APIVersionVendorImplementation == null ? new HashMap<String, String>() : this.APIVersionVendorImplementation);
map.put("enabled", this.enabled == null ? false : this.enabled);
map.put("software_version", this.softwareVersion == null ? new HashMap<String, String>() : this.softwareVersion);
map.put("other_config", this.otherConfig == null ? new HashMap<String, String>() : this.otherConfig);
@@ -202,6 +203,7 @@ public class Host extends XenAPIObject {
map.put("chipset_info", this.chipsetInfo == null ? new HashMap<String, String>() : this.chipsetInfo);
map.put("PCIs", this.PCIs == null ? new LinkedHashSet<PCI>() : this.PCIs);
map.put("PGPUs", this.PGPUs == null ? new LinkedHashSet<PGPU>() : this.PGPUs);
+ map.put("guest_VCPUs_params", this.guestVCPUsParams == null ? new HashMap<String, String>() : this.guestVCPUsParams);
return map;
}
@@ -393,6 +395,10 @@ public class Host extends XenAPIObject {
* List of physical GPUs in the host
*/
public Set<PGPU> PGPUs;
+ /**
+ * VCPUs params to apply to all resident guests
+ */
+ public Map<String, String> guestVCPUsParams;
}
/**
@@ -401,15 +407,15 @@ public class Host extends XenAPIObject {
* @return all fields from the object
*/
public Host.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHostRecord(result);
+ return Types.toHostRecord(result);
}
/**
@@ -419,15 +425,15 @@ public class Host extends XenAPIObject {
* @return reference to the object
*/
public static Host getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -437,15 +443,15 @@ public class Host extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<Host> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHost(result);
+ return Types.toSetOfHost(result);
}
/**
@@ -454,15 +460,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -471,15 +477,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -488,15 +494,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -505,15 +511,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Long getMemoryOverhead(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_memory_overhead";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -522,15 +528,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<Types.HostAllowedOperations> getAllowedOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_allowed_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHostAllowedOperations(result);
+ return Types.toSetOfHostAllowedOperations(result);
}
/**
@@ -539,15 +545,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, Types.HostAllowedOperations> getCurrentOperations(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_current_operations";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringHostAllowedOperations(result);
+ return Types.toMapOfStringHostAllowedOperations(result);
}
/**
@@ -556,15 +562,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Long getAPIVersionMajor(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_API_version_major";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -573,15 +579,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Long getAPIVersionMinor(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_API_version_minor";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -590,15 +596,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getAPIVersionVendor(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_API_version_vendor";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -607,15 +613,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getAPIVersionVendorImplementation(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_API_version_vendor_implementation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -624,15 +630,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Boolean getEnabled(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_enabled";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -641,15 +647,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getSoftwareVersion(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_software_version";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -658,15 +664,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -675,15 +681,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<String> getCapabilities(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_capabilities";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -692,15 +698,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getCpuConfiguration(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_cpu_configuration";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -709,15 +715,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getSchedPolicy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_sched_policy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -726,15 +732,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<String> getSupportedBootloaders(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_supported_bootloaders";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -743,15 +749,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<VM> getResidentVMs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_resident_VMs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVM(result);
+ return Types.toSetOfVM(result);
}
/**
@@ -760,15 +766,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getLogging(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_logging";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -777,15 +783,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<PIF> getPIFs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_PIFs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPIF(result);
+ return Types.toSetOfPIF(result);
}
/**
@@ -794,15 +800,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public SR getSuspendImageSr(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_suspend_image_sr";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -811,15 +817,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public SR getCrashDumpSr(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_crash_dump_sr";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -828,15 +834,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<HostCrashdump> getCrashdumps(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_crashdumps";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHostCrashdump(result);
+ return Types.toSetOfHostCrashdump(result);
}
/**
@@ -845,15 +851,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<HostPatch> getPatches(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_patches";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHostPatch(result);
+ return Types.toSetOfHostPatch(result);
}
/**
@@ -862,15 +868,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<PBD> getPBDs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_PBDs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPBD(result);
+ return Types.toSetOfPBD(result);
}
/**
@@ -879,15 +885,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<HostCpu> getHostCPUs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_host_CPUs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHostCpu(result);
+ return Types.toSetOfHostCpu(result);
}
/**
@@ -896,15 +902,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getCpuInfo(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_cpu_info";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -913,15 +919,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getHostname(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_hostname";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -930,15 +936,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getAddress(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_address";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -947,15 +953,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public HostMetrics getMetrics(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_metrics";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHostMetrics(result);
+ return Types.toHostMetrics(result);
}
/**
@@ -964,15 +970,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getLicenseParams(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_license_params";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -981,15 +987,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<String> getHaStatefiles(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_ha_statefiles";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -998,15 +1004,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<String> getHaNetworkPeers(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_ha_network_peers";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -1015,15 +1021,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, Blob> getBlobs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_blobs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringBlob(result);
+ return Types.toMapOfStringBlob(result);
}
/**
@@ -1032,15 +1038,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<String> getTags(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -1049,15 +1055,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getExternalAuthType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_external_auth_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1066,15 +1072,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getExternalAuthServiceName(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_external_auth_service_name";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1083,15 +1089,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getExternalAuthConfiguration(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_external_auth_configuration";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1100,15 +1106,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getEdition(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_edition";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1117,15 +1123,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getLicenseServer(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_license_server";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1134,15 +1140,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getBiosStrings(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_bios_strings";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1151,15 +1157,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public String getPowerOnMode(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_power_on_mode";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1168,15 +1174,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getPowerOnConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_power_on_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1185,15 +1191,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public SR getLocalCacheSr(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_local_cache_sr";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSR(result);
+ return Types.toSR(result);
}
/**
@@ -1202,15 +1208,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getChipsetInfo(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_chipset_info";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -1219,15 +1225,15 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<PCI> getPCIs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_PCIs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPCI(result);
+ return Types.toSetOfPCI(result);
}
/**
@@ -1236,15 +1242,32 @@ public class Host extends XenAPIObject {
* @return value of the field
*/
public Set<PGPU> getPGPUs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_PGPUs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfPGPU(result);
+ return Types.toSetOfPGPU(result);
+ }
+
+ /**
+ * Get the guest_VCPUs_params field of the given host.
+ *
+ * @return value of the field
+ */
+ public Map<String, String> getGuestVCPUsParams(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "host.get_guest_VCPUs_params";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
+ Map response = c.dispatch(method_call, method_params);
+ Object result = response.get("Value");
+ return Types.toMapOfStringString(result);
}
/**
@@ -1253,9 +1276,9 @@ public class Host extends XenAPIObject {
* @param label New value to set
*/
public void setNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(label)};
@@ -1269,9 +1292,9 @@ public class Host extends XenAPIObject {
* @param description New value to set
*/
public void setNameDescription(Connection c, String description) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(description)};
@@ -1285,9 +1308,9 @@ public class Host extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -1302,9 +1325,9 @@ public class Host extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -1318,9 +1341,9 @@ public class Host extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -1334,9 +1357,9 @@ public class Host extends XenAPIObject {
* @param logging New value to set
*/
public void setLogging(Connection c, Map<String, String> logging) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.set_logging";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(logging)};
@@ -1351,9 +1374,9 @@ public class Host extends XenAPIObject {
* @param value Value to add
*/
public void addToLogging(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.add_to_logging";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -1367,9 +1390,9 @@ public class Host extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromLogging(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.remove_from_logging";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -1383,9 +1406,9 @@ public class Host extends XenAPIObject {
* @param suspendImageSr New value to set
*/
public void setSuspendImageSr(Connection c, SR suspendImageSr) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.set_suspend_image_sr";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(suspendImageSr)};
@@ -1399,9 +1422,9 @@ public class Host extends XenAPIObject {
* @param crashDumpSr New value to set
*/
public void setCrashDumpSr(Connection c, SR crashDumpSr) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.set_crash_dump_sr";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(crashDumpSr)};
@@ -1415,9 +1438,9 @@ public class Host extends XenAPIObject {
* @param hostname New value to set
*/
public void setHostname(Connection c, String hostname) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.set_hostname";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(hostname)};
@@ -1431,9 +1454,9 @@ public class Host extends XenAPIObject {
* @param address New value to set
*/
public void setAddress(Connection c, String address) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.set_address";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(address)};
@@ -1447,9 +1470,9 @@ public class Host extends XenAPIObject {
* @param tags New value to set
*/
public void setTags(Connection c, Set<String> tags) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.set_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(tags)};
@@ -1463,9 +1486,9 @@ public class Host extends XenAPIObject {
* @param value New value to add
*/
public void addTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.add_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1479,9 +1502,9 @@ public class Host extends XenAPIObject {
* @param value Value to remove
*/
public void removeTags(Connection c, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.remove_tags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1495,9 +1518,9 @@ public class Host extends XenAPIObject {
* @param licenseServer New value to set
*/
public void setLicenseServer(Connection c, Map<String, String> licenseServer) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.set_license_server";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(licenseServer)};
@@ -1512,9 +1535,9 @@ public class Host extends XenAPIObject {
* @param value Value to add
*/
public void addToLicenseServer(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.add_to_license_server";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -1528,9 +1551,9 @@ public class Host extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromLicenseServer(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.remove_from_license_server";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -1539,14 +1562,63 @@ public class Host extends XenAPIObject {
}
/**
+ * Set the guest_VCPUs_params field of the given host.
+ *
+ * @param guestVCPUsParams New value to set
+ */
+ public void setGuestVCPUsParams(Connection c, Map<String, String> guestVCPUsParams) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "host.set_guest_VCPUs_params";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(guestVCPUsParams)};
+ Map response = c.dispatch(method_call, method_params);
+ return;
+ }
+
+ /**
+ * Add the given key-value pair to the guest_VCPUs_params field of the given host.
+ *
+ * @param key Key to add
+ * @param value Value to add
+ */
+ public void addToGuestVCPUsParams(Connection c, String key, String value) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "host.add_to_guest_VCPUs_params";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
+ Map response = c.dispatch(method_call, method_params);
+ return;
+ }
+
+ /**
+ * Remove the given key and its corresponding value from the guest_VCPUs_params field of the given host. If the key is not in that Map, then do nothing.
+ *
+ * @param key Key to remove
+ */
+ public void removeFromGuestVCPUsParams(Connection c, String key) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
+ String method_call = "host.remove_from_guest_VCPUs_params";
+ String session = c.getSessionReference();
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
+ Map response = c.dispatch(method_call, method_params);
+ return;
+ }
+
+ /**
* Puts the host into a state in which no new VMs can be started. Currently active VMs on the host continue to execute.
*
* @return Task
*/
public Task disableAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.disable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1560,9 +1632,9 @@ public class Host extends XenAPIObject {
*
*/
public void disable(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.disable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1576,9 +1648,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task enableAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.enable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1592,9 +1664,9 @@ public class Host extends XenAPIObject {
*
*/
public void enable(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.enable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1608,9 +1680,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task shutdownAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.shutdown";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1624,9 +1696,9 @@ public class Host extends XenAPIObject {
*
*/
public void shutdown(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.shutdown";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1640,9 +1712,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task rebootAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.reboot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1656,9 +1728,9 @@ public class Host extends XenAPIObject {
*
*/
public void reboot(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.reboot";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1672,9 +1744,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task dmesgAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.dmesg";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1689,15 +1761,15 @@ public class Host extends XenAPIObject {
* @return dmesg string
*/
public String dmesg(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.dmesg";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1706,9 +1778,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task dmesgClearAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.dmesg_clear";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1723,15 +1795,15 @@ public class Host extends XenAPIObject {
* @return dmesg string
*/
public String dmesgClear(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.dmesg_clear";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1740,9 +1812,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task getLogAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.get_log";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1757,15 +1829,15 @@ public class Host extends XenAPIObject {
* @return The contents of the host's primary log file
*/
public String getLog(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_log";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -1775,9 +1847,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task sendDebugKeysAsync(Connection c, String keys) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.send_debug_keys";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(keys)};
@@ -1792,9 +1864,9 @@ public class Host extends XenAPIObject {
* @param keys The keys to send
*/
public void sendDebugKeys(Connection c, String keys) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.send_debug_keys";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(keys)};
@@ -1810,9 +1882,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task bugreportUploadAsync(Connection c, String url, Map<String, String> options) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.bugreport_upload";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(url), Marshalling.toXMLRPC(options)};
@@ -1828,9 +1900,9 @@ public class Host extends XenAPIObject {
* @param options Extra configuration operations
*/
public void bugreportUpload(Connection c, String url, Map<String, String> options) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.bugreport_upload";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(url), Marshalling.toXMLRPC(options)};
@@ -1844,15 +1916,15 @@ public class Host extends XenAPIObject {
* @return The name of every supported method.
*/
public static Set<String> listMethods(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.list_methods";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -1862,10 +1934,10 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task licenseApplyAsync(Connection c, String contents) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.LicenseProcessingError {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.LicenseProcessingError {
String method_call = "Async.host.license_apply";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(contents)};
@@ -1880,10 +1952,10 @@ public class Host extends XenAPIObject {
* @param contents The contents of the license file, base64 encoded
*/
public void licenseApply(Connection c, String contents) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.LicenseProcessingError {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.LicenseProcessingError {
String method_call = "host.license_apply";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(contents)};
@@ -1897,9 +1969,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1913,9 +1985,9 @@ public class Host extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1929,9 +2001,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task powerOnAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.power_on";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1945,9 +2017,9 @@ public class Host extends XenAPIObject {
*
*/
public void powerOn(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.power_on";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -1960,9 +2032,9 @@ public class Host extends XenAPIObject {
*
*/
public static void emergencyHaDisable(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.emergency_ha_disable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -1971,20 +2043,20 @@ public class Host extends XenAPIObject {
}
/**
- *
+ *
*
* @return A set of data sources
*/
public Set<DataSource.Record> getDataSources(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_data_sources";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfDataSourceRecord(result);
+ return Types.toSetOfDataSourceRecord(result);
}
/**
@@ -1993,9 +2065,9 @@ public class Host extends XenAPIObject {
* @param dataSource The data source to record
*/
public void recordDataSource(Connection c, String dataSource) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.record_data_source";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(dataSource)};
@@ -2010,15 +2082,15 @@ public class Host extends XenAPIObject {
* @return The latest value, averaged over the last 5 seconds
*/
public Double queryDataSource(Connection c, String dataSource) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.query_data_source";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(dataSource)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDouble(result);
+ return Types.toDouble(result);
}
/**
@@ -2027,9 +2099,9 @@ public class Host extends XenAPIObject {
* @param dataSource The data source whose archives are to be forgotten
*/
public void forgetDataSourceArchives(Connection c, String dataSource) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.forget_data_source_archives";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(dataSource)};
@@ -2043,9 +2115,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task assertCanEvacuateAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.assert_can_evacuate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2059,9 +2131,9 @@ public class Host extends XenAPIObject {
*
*/
public void assertCanEvacuate(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.assert_can_evacuate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2075,9 +2147,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task getVmsWhichPreventEvacuationAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.get_vms_which_prevent_evacuation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2092,15 +2164,15 @@ public class Host extends XenAPIObject {
* @return VMs which block evacuation together with reasons
*/
public Map<VM, Set<String>> getVmsWhichPreventEvacuation(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_vms_which_prevent_evacuation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVMSetOfString(result);
+ return Types.toMapOfVMSetOfString(result);
}
/**
@@ -2109,11 +2181,10 @@ public class Host extends XenAPIObject {
*
* @return Task
*/
- @Deprecated
- public Task getUncooperativeResidentVMsAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public Task getUncooperativeResidentVMsAsync(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.get_uncooperative_resident_VMs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2128,17 +2199,16 @@ public class Host extends XenAPIObject {
*
* @return VMs which are not co-operating
*/
- @Deprecated
- public Set<VM> getUncooperativeResidentVMs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public Set<VM> getUncooperativeResidentVMs(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_uncooperative_resident_VMs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVM(result);
+ return Types.toSetOfVM(result);
}
/**
@@ -2147,9 +2217,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task evacuateAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.evacuate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2163,9 +2233,9 @@ public class Host extends XenAPIObject {
*
*/
public void evacuate(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.evacuate";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2179,9 +2249,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task syslogReconfigureAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.syslog_reconfigure";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2195,9 +2265,9 @@ public class Host extends XenAPIObject {
*
*/
public void syslogReconfigure(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.syslog_reconfigure";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2212,9 +2282,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public static Task managementReconfigureAsync(Connection c, PIF pif) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.management_reconfigure";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(pif)};
@@ -2229,9 +2299,9 @@ public class Host extends XenAPIObject {
* @param pif reference to a PIF object corresponding to the management interface
*/
public static void managementReconfigure(Connection c, PIF pif) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.management_reconfigure";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(pif)};
@@ -2245,9 +2315,9 @@ public class Host extends XenAPIObject {
* @param iface name of the interface to use as a management interface
*/
public static void localManagementReconfigure(Connection c, String iface) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.local_management_reconfigure";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(iface)};
@@ -2260,9 +2330,9 @@ public class Host extends XenAPIObject {
*
*/
public static void managementDisable(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.management_disable";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -2276,9 +2346,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task getManagementIfaceAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.get_management_interface";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2293,32 +2363,32 @@ public class Host extends XenAPIObject {
* @return The managment interface for the host
*/
public PIF getManagementIface(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_management_interface";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPIF(result);
+ return Types.toPIF(result);
}
/**
- *
+ *
*
* @return An XML fragment containing the system status capabilities.
*/
public String getSystemStatusCapabilities(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.get_system_status_capabilities";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -2327,9 +2397,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task restartAgentAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.restart_agent";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2343,9 +2413,9 @@ public class Host extends XenAPIObject {
*
*/
public void restartAgent(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.restart_agent";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2358,9 +2428,9 @@ public class Host extends XenAPIObject {
*
*/
public static void shutdownAgent(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.shutdown_agent";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
@@ -2374,10 +2444,10 @@ public class Host extends XenAPIObject {
* @param hostname The new host name
*/
public void setHostnameLive(Connection c, String hostname) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException,
- Types.HostNameInvalid {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException,
+ Types.HostNameInvalid {
String method_call = "host.set_hostname_live";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(hostname)};
@@ -2391,9 +2461,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task computeFreeMemoryAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.compute_free_memory";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2408,15 +2478,15 @@ public class Host extends XenAPIObject {
* @return the amount of free memory on the host.
*/
public Long computeFreeMemory(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.compute_free_memory";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -2425,9 +2495,9 @@ public class Host extends XenAPIObject {
* @return Task
*/
public Task computeMemoryOverheadAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host.compute_memory_overhead";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2442,15 +2512,15 @@ public class Host extends XenAPIObject {
* @return the virtualization memory overhead of the host.
*/
public Long computeMemoryOverhead(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.compute_memory_overhead";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -2458,9 +2528,9 @@ public class Host extends XenAPIObject {
*
*/
public void syncData(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host.sync_data";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -2474,9 +2544,9 @@ public class Host extends XenAPIObject {
* @param delay Delay in seconds from when the call is received to perform the backup
*/
public void backupRrds(Connection c, Double delay) throws
- BadServerResponse,
- XenAPIException,
-
<TRUNCATED>
[16/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/HostCpu.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/HostCpu.java b/deps/XenServerJava/src/com/xensource/xenapi/HostCpu.java
index 15fcfa7..0f802f8 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/HostCpu.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/HostCpu.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class HostCpu extends XenAPIObject {
* For internal use only.
*/
HostCpu(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class HostCpu extends XenAPIObject {
{
if (obj != null && obj instanceof HostCpu)
{
- HostCpu other = (HostCpu)obj;
+ HostCpu other = (HostCpu) obj;
return other.ref.equals(this.ref);
} else
{
@@ -118,8 +119,8 @@ public class HostCpu extends XenAPIObject {
/**
* Convert a host_cpu.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("host", this.host == null ? new Host("OpaqueRef:NULL") : this.host);
map.put("number", this.number == null ? 0 : this.number);
@@ -196,17 +197,16 @@ public class HostCpu extends XenAPIObject {
*
* @return all fields from the object
*/
- @Deprecated
- public HostCpu.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public HostCpu.Record getRecord(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHostCpuRecord(result);
+ return Types.toHostCpuRecord(result);
}
/**
@@ -216,17 +216,16 @@ public class HostCpu extends XenAPIObject {
* @param uuid UUID of object to return
* @return reference to the object
*/
- @Deprecated
- public static HostCpu getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public static HostCpu getByUuid(Connection c, String uuid) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHostCpu(result);
+ return Types.toHostCpu(result);
}
/**
@@ -235,15 +234,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -252,15 +251,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public Host getHost(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_host";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -269,15 +268,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public Long getNumber(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_number";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -286,15 +285,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public String getVendor(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_vendor";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -303,15 +302,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public Long getSpeed(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_speed";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -320,15 +319,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public String getModelname(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_modelname";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -337,15 +336,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public Long getFamily(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_family";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -354,15 +353,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public Long getModel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_model";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -371,15 +370,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public String getStepping(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_stepping";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -388,15 +387,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public String getFlags(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_flags";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -405,15 +404,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public String getFeatures(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_features";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -422,15 +421,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public Double getUtilisation(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_utilisation";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDouble(result);
+ return Types.toDouble(result);
}
/**
@@ -439,15 +438,15 @@ public class HostCpu extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -456,9 +455,9 @@ public class HostCpu extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -473,9 +472,9 @@ public class HostCpu extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -489,9 +488,9 @@ public class HostCpu extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -505,17 +504,16 @@ public class HostCpu extends XenAPIObject {
*
* @return references to all objects
*/
- @Deprecated
- public static Set<HostCpu> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public static Set<HostCpu> getAll(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHostCpu(result);
+ return Types.toSetOfHostCpu(result);
}
/**
@@ -524,15 +522,15 @@ public class HostCpu extends XenAPIObject {
* @return records of all objects
*/
public static Map<HostCpu, HostCpu.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_cpu.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfHostCpuHostCpuRecord(result);
+ return Types.toMapOfHostCpuHostCpuRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/HostCrashdump.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/HostCrashdump.java b/deps/XenServerJava/src/com/xensource/xenapi/HostCrashdump.java
index 02c3bd9..e93240e 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/HostCrashdump.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/HostCrashdump.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class HostCrashdump extends XenAPIObject {
* For internal use only.
*/
HostCrashdump(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class HostCrashdump extends XenAPIObject {
{
if (obj != null && obj instanceof HostCrashdump)
{
- HostCrashdump other = (HostCrashdump)obj;
+ HostCrashdump other = (HostCrashdump) obj;
return other.ref.equals(this.ref);
} else
{
@@ -110,8 +111,8 @@ public class HostCrashdump extends XenAPIObject {
/**
* Convert a host_crashdump.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("host", this.host == null ? new Host("OpaqueRef:NULL") : this.host);
map.put("timestamp", this.timestamp == null ? new Date(0) : this.timestamp);
@@ -148,15 +149,15 @@ public class HostCrashdump extends XenAPIObject {
* @return all fields from the object
*/
public HostCrashdump.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHostCrashdumpRecord(result);
+ return Types.toHostCrashdumpRecord(result);
}
/**
@@ -166,15 +167,15 @@ public class HostCrashdump extends XenAPIObject {
* @return reference to the object
*/
public static HostCrashdump getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHostCrashdump(result);
+ return Types.toHostCrashdump(result);
}
/**
@@ -183,15 +184,15 @@ public class HostCrashdump extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -200,15 +201,15 @@ public class HostCrashdump extends XenAPIObject {
* @return value of the field
*/
public Host getHost(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.get_host";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -217,15 +218,15 @@ public class HostCrashdump extends XenAPIObject {
* @return value of the field
*/
public Date getTimestamp(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.get_timestamp";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -234,15 +235,15 @@ public class HostCrashdump extends XenAPIObject {
* @return value of the field
*/
public Long getSize(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.get_size";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -251,15 +252,15 @@ public class HostCrashdump extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -268,9 +269,9 @@ public class HostCrashdump extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -285,9 +286,9 @@ public class HostCrashdump extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -301,9 +302,9 @@ public class HostCrashdump extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -317,9 +318,9 @@ public class HostCrashdump extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host_crashdump.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -333,9 +334,9 @@ public class HostCrashdump extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -351,9 +352,9 @@ public class HostCrashdump extends XenAPIObject {
* @return Task
*/
public Task uploadAsync(Connection c, String url, Map<String, String> options) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host_crashdump.upload";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(url), Marshalling.toXMLRPC(options)};
@@ -369,9 +370,9 @@ public class HostCrashdump extends XenAPIObject {
* @param options Extra configuration operations
*/
public void upload(Connection c, String url, Map<String, String> options) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.upload";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(url), Marshalling.toXMLRPC(options)};
@@ -385,15 +386,15 @@ public class HostCrashdump extends XenAPIObject {
* @return references to all objects
*/
public static Set<HostCrashdump> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHostCrashdump(result);
+ return Types.toSetOfHostCrashdump(result);
}
/**
@@ -402,15 +403,15 @@ public class HostCrashdump extends XenAPIObject {
* @return records of all objects
*/
public static Map<HostCrashdump, HostCrashdump.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_crashdump.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfHostCrashdumpHostCrashdumpRecord(result);
+ return Types.toMapOfHostCrashdumpHostCrashdumpRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/HostMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/HostMetrics.java b/deps/XenServerJava/src/com/xensource/xenapi/HostMetrics.java
index b41277a..261933f 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/HostMetrics.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/HostMetrics.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class HostMetrics extends XenAPIObject {
* For internal use only.
*/
HostMetrics(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class HostMetrics extends XenAPIObject {
{
if (obj != null && obj instanceof HostMetrics)
{
- HostMetrics other = (HostMetrics)obj;
+ HostMetrics other = (HostMetrics) obj;
return other.ref.equals(this.ref);
} else
{
@@ -111,8 +112,8 @@ public class HostMetrics extends XenAPIObject {
/**
* Convert a host_metrics.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("memory_total", this.memoryTotal == null ? 0 : this.memoryTotal);
map.put("memory_free", this.memoryFree == null ? 0 : this.memoryFree);
@@ -154,15 +155,15 @@ public class HostMetrics extends XenAPIObject {
* @return all fields from the object
*/
public HostMetrics.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHostMetricsRecord(result);
+ return Types.toHostMetricsRecord(result);
}
/**
@@ -172,15 +173,15 @@ public class HostMetrics extends XenAPIObject {
* @return reference to the object
*/
public static HostMetrics getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHostMetrics(result);
+ return Types.toHostMetrics(result);
}
/**
@@ -189,15 +190,15 @@ public class HostMetrics extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -206,15 +207,15 @@ public class HostMetrics extends XenAPIObject {
* @return value of the field
*/
public Long getMemoryTotal(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.get_memory_total";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -223,17 +224,16 @@ public class HostMetrics extends XenAPIObject {
*
* @return value of the field
*/
- @Deprecated
- public Long getMemoryFree(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public Long getMemoryFree(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.get_memory_free";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -242,15 +242,15 @@ public class HostMetrics extends XenAPIObject {
* @return value of the field
*/
public Boolean getLive(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.get_live";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -259,15 +259,15 @@ public class HostMetrics extends XenAPIObject {
* @return value of the field
*/
public Date getLastUpdated(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.get_last_updated";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -276,15 +276,15 @@ public class HostMetrics extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -293,9 +293,9 @@ public class HostMetrics extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -310,9 +310,9 @@ public class HostMetrics extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -326,9 +326,9 @@ public class HostMetrics extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -342,15 +342,15 @@ public class HostMetrics extends XenAPIObject {
* @return references to all objects
*/
public static Set<HostMetrics> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHostMetrics(result);
+ return Types.toSetOfHostMetrics(result);
}
/**
@@ -359,15 +359,15 @@ public class HostMetrics extends XenAPIObject {
* @return records of all objects
*/
public static Map<HostMetrics, HostMetrics.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_metrics.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfHostMetricsHostMetricsRecord(result);
+ return Types.toMapOfHostMetricsHostMetricsRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/HostPatch.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/HostPatch.java b/deps/XenServerJava/src/com/xensource/xenapi/HostPatch.java
index fa77588..0f229dc 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/HostPatch.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/HostPatch.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class HostPatch extends XenAPIObject {
* For internal use only.
*/
HostPatch(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class HostPatch extends XenAPIObject {
{
if (obj != null && obj instanceof HostPatch)
{
- HostPatch other = (HostPatch)obj;
+ HostPatch other = (HostPatch) obj;
return other.ref.equals(this.ref);
} else
{
@@ -115,8 +116,8 @@ public class HostPatch extends XenAPIObject {
/**
* Convert a host_patch.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -178,15 +179,15 @@ public class HostPatch extends XenAPIObject {
* @return all fields from the object
*/
public HostPatch.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHostPatchRecord(result);
+ return Types.toHostPatchRecord(result);
}
/**
@@ -196,15 +197,15 @@ public class HostPatch extends XenAPIObject {
* @return reference to the object
*/
public static HostPatch getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHostPatch(result);
+ return Types.toHostPatch(result);
}
/**
@@ -214,15 +215,15 @@ public class HostPatch extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<HostPatch> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHostPatch(result);
+ return Types.toSetOfHostPatch(result);
}
/**
@@ -231,15 +232,15 @@ public class HostPatch extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -248,15 +249,15 @@ public class HostPatch extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -265,15 +266,15 @@ public class HostPatch extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -282,15 +283,15 @@ public class HostPatch extends XenAPIObject {
* @return value of the field
*/
public String getVersion(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_version";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -299,15 +300,15 @@ public class HostPatch extends XenAPIObject {
* @return value of the field
*/
public Host getHost(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_host";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toHost(result);
+ return Types.toHost(result);
}
/**
@@ -316,15 +317,15 @@ public class HostPatch extends XenAPIObject {
* @return value of the field
*/
public Boolean getApplied(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_applied";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -333,15 +334,15 @@ public class HostPatch extends XenAPIObject {
* @return value of the field
*/
public Date getTimestampApplied(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_timestamp_applied";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -350,15 +351,15 @@ public class HostPatch extends XenAPIObject {
* @return value of the field
*/
public Long getSize(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_size";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -367,15 +368,15 @@ public class HostPatch extends XenAPIObject {
* @return value of the field
*/
public PoolPatch getPoolPatch(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_pool_patch";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toPoolPatch(result);
+ return Types.toPoolPatch(result);
}
/**
@@ -384,15 +385,15 @@ public class HostPatch extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getOtherConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -401,9 +402,9 @@ public class HostPatch extends XenAPIObject {
* @param otherConfig New value to set
*/
public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.set_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -418,9 +419,9 @@ public class HostPatch extends XenAPIObject {
* @param value Value to add
*/
public void addToOtherConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.add_to_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -434,9 +435,9 @@ public class HostPatch extends XenAPIObject {
* @param key Key to remove
*/
public void removeFromOtherConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.remove_from_other_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -450,11 +451,10 @@ public class HostPatch extends XenAPIObject {
*
* @return Task
*/
- @Deprecated
- public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public Task destroyAsync(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host_patch.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -468,11 +468,10 @@ public class HostPatch extends XenAPIObject {
* @deprecated
*
*/
- @Deprecated
- public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public void destroy(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -486,11 +485,10 @@ public class HostPatch extends XenAPIObject {
*
* @return Task
*/
- @Deprecated
- public Task applyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public Task applyAsync(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.host_patch.apply";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -505,17 +503,16 @@ public class HostPatch extends XenAPIObject {
*
* @return the output of the patch application process
*/
- @Deprecated
- public String apply(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ @Deprecated public String apply(Connection c) throws
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.apply";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -524,15 +521,15 @@ public class HostPatch extends XenAPIObject {
* @return references to all objects
*/
public static Set<HostPatch> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfHostPatch(result);
+ return Types.toSetOfHostPatch(result);
}
/**
@@ -541,15 +538,15 @@ public class HostPatch extends XenAPIObject {
* @return records of all objects
*/
public static Map<HostPatch, HostPatch.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "host_patch.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfHostPatchHostPatchRecord(result);
+ return Types.toMapOfHostPatchHostPatchRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Marshalling.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Marshalling.java b/deps/XenServerJava/src/com/xensource/xenapi/Marshalling.java
old mode 100644
new mode 100755
index 865bc16..b7483c1
--- a/deps/XenServerJava/src/com/xensource/xenapi/Marshalling.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Marshalling.java
@@ -1,15 +1,33 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
-// Apache License, Version 2.0 (the "License"); you may not use this
-// file except in compliance with the License. Citrix Systems, Inc.
-// reserves all rights not expressly granted by the License.
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Automatically generated by addcopyright.py at 04/03/2012
+/*
+ * Copyright (c) Citrix Systems, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1) Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2) Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
package com.xensource.xenapi;
import java.util.*;
@@ -29,8 +47,8 @@ public final class Marshalling {
o instanceof Double ||
o instanceof Date) {
return o;
- } else if (o instanceof Long) {
- return o.toString();
+ } else if (o instanceof Long) {
+ return o.toString();
} else if (o instanceof Map) {
Map<Object, Object> result = new HashMap<Object, Object>();
Map m = (Map)o;
@@ -46,14 +64,14 @@ public final class Marshalling {
result.add(toXMLRPC(e));
}
return result;
- } else if (o instanceof XenAPIObject) {
- return ((XenAPIObject)o).toWireString();
- } else if (o instanceof Enum) {
- return o.toString();
- } else if (o == null) {
- return "";
+ } else if (o instanceof XenAPIObject) {
+ return ((XenAPIObject) o).toWireString();
+ } else if (o instanceof Enum) {
+ return o.toString();
+ }else if (o == null){
+ return "";
} else {
- throw new RuntimeException("=============don't know how to marshall:({[" + o + "]})");
+ throw new RuntimeException ("=============don't know how to marshall:({[" + o + "]})");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Message.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Message.java b/deps/XenServerJava/src/com/xensource/xenapi/Message.java
index a3658e3..8cb4127 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Message.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Message.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Message extends XenAPIObject {
* For internal use only.
*/
Message(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class Message extends XenAPIObject {
{
if (obj != null && obj instanceof Message)
{
- Message other = (Message)obj;
+ Message other = (Message) obj;
return other.ref.equals(this.ref);
} else
{
@@ -112,8 +113,8 @@ public class Message extends XenAPIObject {
/**
* Convert a message.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name", this.name == null ? "" : this.name);
map.put("priority", this.priority == null ? 0 : this.priority);
@@ -155,7 +156,7 @@ public class Message extends XenAPIObject {
}
/**
- *
+ *
*
* @param name The name of the message
* @param priority The priority of the message
@@ -165,26 +166,25 @@ public class Message extends XenAPIObject {
* @return The reference of the created message
*/
public static Message create(Connection c, String name, Long priority, Types.Cls cls, String objUuid, String body) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "message.create";
String session = c.getSessionReference();
- Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(priority), Marshalling.toXMLRPC(cls),
- Marshalling.toXMLRPC(objUuid), Marshalling.toXMLRPC(body)};
+ Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(priority), Marshalling.toXMLRPC(cls), Marshalling.toXMLRPC(objUuid), Marshalling.toXMLRPC(body)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMessage(result);
+ return Types.toMessage(result);
}
/**
- *
+ *
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "message.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -193,7 +193,7 @@ public class Message extends XenAPIObject {
}
/**
- *
+ *
*
* @param cls The class of object
* @param objUuid The uuid of the object
@@ -201,120 +201,120 @@ public class Message extends XenAPIObject {
* @return The relevant messages
*/
public static Map<Message, Message.Record> get(Connection c, Types.Cls cls, String objUuid, Date since) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "message.get";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(cls), Marshalling.toXMLRPC(objUuid), Marshalling.toXMLRPC(since)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfMessageMessageRecord(result);
+ return Types.toMapOfMessageMessageRecord(result);
}
/**
- *
+ *
*
* @return The references to the messages
*/
public static Set<Message> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "message.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfMessage(result);
+ return Types.toSetOfMessage(result);
}
/**
- *
+ *
*
* @param since The cutoff time
* @return The relevant messages
*/
public static Map<Message, Message.Record> getSince(Connection c, Date since) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "message.get_since";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(since)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfMessageMessageRecord(result);
+ return Types.toMapOfMessageMessageRecord(result);
}
/**
- *
+ *
*
* @return The message record
*/
public Message.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "message.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMessageRecord(result);
+ return Types.toMessageRecord(result);
}
/**
- *
+ *
*
* @param uuid The uuid of the message
* @return The message reference
*/
public static Message getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "message.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMessage(result);
+ return Types.toMessage(result);
}
/**
- *
+ *
*
* @return The messages
*/
public static Map<Message, Message.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "message.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfMessageMessageRecord(result);
+ return Types.toMapOfMessageMessageRecord(result);
}
/**
- *
+ *
*
* @param expr The expression to match (not currently used)
* @return The messages
*/
public static Map<Message, Message.Record> getAllRecordsWhere(Connection c, String expr) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "message.get_all_records_where";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(expr)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfMessageMessageRecord(result);
+ return Types.toMapOfMessageMessageRecord(result);
}
}
\ No newline at end of file
[02/50] [abbrv] CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VMPP.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VMPP.java b/deps/XenServerJava/src/com/xensource/xenapi/VMPP.java
index 0ee0b3e..f49019b 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VMPP.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VMPP.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VMPP extends XenAPIObject {
* For internal use only.
*/
VMPP(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VMPP extends XenAPIObject {
{
if (obj != null && obj instanceof VMPP)
{
- VMPP other = (VMPP)obj;
+ VMPP other = (VMPP) obj;
return other.ref.equals(this.ref);
} else
{
@@ -125,8 +126,8 @@ public class VMPP extends XenAPIObject {
/**
* Convert a VMPP.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -238,15 +239,15 @@ public class VMPP extends XenAPIObject {
* @return all fields from the object
*/
public VMPP.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMPPRecord(result);
+ return Types.toVMPPRecord(result);
}
/**
@@ -256,15 +257,15 @@ public class VMPP extends XenAPIObject {
* @return reference to the object
*/
public static VMPP getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMPP(result);
+ return Types.toVMPP(result);
}
/**
@@ -274,9 +275,9 @@ public class VMPP extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, VMPP.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VMPP.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -293,16 +294,16 @@ public class VMPP extends XenAPIObject {
* @return reference to the newly created object
*/
public static VMPP create(Connection c, VMPP.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVMPP(result);
+ return Types.toVMPP(result);
}
/**
@@ -311,9 +312,9 @@ public class VMPP extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VMPP.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -327,9 +328,9 @@ public class VMPP extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -344,15 +345,15 @@ public class VMPP extends XenAPIObject {
* @return references to objects with matching names
*/
public static Set<VMPP> getByNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_by_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVMPP(result);
+ return Types.toSetOfVMPP(result);
}
/**
@@ -361,15 +362,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -378,15 +379,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public String getNameLabel(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -395,15 +396,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public String getNameDescription(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -412,15 +413,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Boolean getIsPolicyEnabled(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_is_policy_enabled";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -429,15 +430,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Types.VmppBackupType getBackupType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_backup_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVmppBackupType(result);
+ return Types.toVmppBackupType(result);
}
/**
@@ -446,15 +447,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Long getBackupRetentionValue(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_backup_retention_value";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toLong(result);
+ return Types.toLong(result);
}
/**
@@ -463,15 +464,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Types.VmppBackupFrequency getBackupFrequency(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_backup_frequency";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVmppBackupFrequency(result);
+ return Types.toVmppBackupFrequency(result);
}
/**
@@ -480,15 +481,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getBackupSchedule(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_backup_schedule";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -497,15 +498,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Boolean getIsBackupRunning(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_is_backup_running";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -514,15 +515,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Date getBackupLastRunTime(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_backup_last_run_time";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -531,15 +532,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Types.VmppArchiveTargetType getArchiveTargetType(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_archive_target_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVmppArchiveTargetType(result);
+ return Types.toVmppArchiveTargetType(result);
}
/**
@@ -548,15 +549,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getArchiveTargetConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_archive_target_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -565,15 +566,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Types.VmppArchiveFrequency getArchiveFrequency(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_archive_frequency";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVmppArchiveFrequency(result);
+ return Types.toVmppArchiveFrequency(result);
}
/**
@@ -582,15 +583,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getArchiveSchedule(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_archive_schedule";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -599,15 +600,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Boolean getIsArchiveRunning(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_is_archive_running";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -616,15 +617,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Date getArchiveLastRunTime(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_archive_last_run_time";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toDate(result);
+ return Types.toDate(result);
}
/**
@@ -633,15 +634,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Set<VM> getVMs(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_VMs";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVM(result);
+ return Types.toSetOfVM(result);
}
/**
@@ -650,15 +651,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Boolean getIsAlarmEnabled(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_is_alarm_enabled";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toBoolean(result);
+ return Types.toBoolean(result);
}
/**
@@ -667,15 +668,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Map<String, String> getAlarmConfig(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_alarm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfStringString(result);
+ return Types.toMapOfStringString(result);
}
/**
@@ -684,15 +685,15 @@ public class VMPP extends XenAPIObject {
* @return value of the field
*/
public Set<String> getRecentAlerts(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_recent_alerts";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
@@ -701,9 +702,9 @@ public class VMPP extends XenAPIObject {
* @param label New value to set
*/
public void setNameLabel(Connection c, String label) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_name_label";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(label)};
@@ -717,9 +718,9 @@ public class VMPP extends XenAPIObject {
* @param description New value to set
*/
public void setNameDescription(Connection c, String description) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_name_description";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(description)};
@@ -733,9 +734,9 @@ public class VMPP extends XenAPIObject {
* @param isPolicyEnabled New value to set
*/
public void setIsPolicyEnabled(Connection c, Boolean isPolicyEnabled) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_is_policy_enabled";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(isPolicyEnabled)};
@@ -749,9 +750,9 @@ public class VMPP extends XenAPIObject {
* @param backupType New value to set
*/
public void setBackupType(Connection c, Types.VmppBackupType backupType) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_backup_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(backupType)};
@@ -765,15 +766,15 @@ public class VMPP extends XenAPIObject {
* @return An XMLRPC result
*/
public String protectNow(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.protect_now";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -783,15 +784,15 @@ public class VMPP extends XenAPIObject {
* @return An XMLRPC result
*/
public static String archiveNow(Connection c, VM snapshot) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.archive_now";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(snapshot)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -801,26 +802,26 @@ public class VMPP extends XenAPIObject {
* @return A list of alerts encoded in xml
*/
public Set<String> getAlerts(Connection c, Long hoursFromNow) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_alerts";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(hoursFromNow)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfString(result);
+ return Types.toSetOfString(result);
}
/**
- *
+ *
*
* @param value the value to set
*/
public void setBackupRetentionValue(Connection c, Long value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_backup_retention_value";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -834,9 +835,9 @@ public class VMPP extends XenAPIObject {
* @param value the backup frequency
*/
public void setBackupFrequency(Connection c, Types.VmppBackupFrequency value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_backup_frequency";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -845,14 +846,14 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param value the value to set
*/
public void setBackupSchedule(Connection c, Map<String, String> value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_backup_schedule";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -866,9 +867,9 @@ public class VMPP extends XenAPIObject {
* @param value the archive frequency
*/
public void setArchiveFrequency(Connection c, Types.VmppArchiveFrequency value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_archive_frequency";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -877,14 +878,14 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param value the value to set
*/
public void setArchiveSchedule(Connection c, Map<String, String> value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_archive_schedule";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -898,9 +899,9 @@ public class VMPP extends XenAPIObject {
* @param value the archive target config type
*/
public void setArchiveTargetType(Connection c, Types.VmppArchiveTargetType value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_archive_target_type";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -909,14 +910,14 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param value the value to set
*/
public void setArchiveTargetConfig(Connection c, Map<String, String> value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_archive_target_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -930,9 +931,9 @@ public class VMPP extends XenAPIObject {
* @param value true if alarm is enabled for this policy
*/
public void setIsAlarmEnabled(Connection c, Boolean value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_is_alarm_enabled";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -941,14 +942,14 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param value the value to set
*/
public void setAlarmConfig(Connection c, Map<String, String> value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_alarm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -957,15 +958,15 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param key the key to add
* @param value the value to add
*/
public void addToBackupSchedule(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.add_to_backup_schedule";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -974,15 +975,15 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param key the key to add
* @param value the value to add
*/
public void addToArchiveTargetConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.add_to_archive_target_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -991,15 +992,15 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param key the key to add
* @param value the value to add
*/
public void addToArchiveSchedule(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.add_to_archive_schedule";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -1008,15 +1009,15 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param key the key to add
* @param value the value to add
*/
public void addToAlarmConfig(Connection c, String key, String value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.add_to_alarm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -1025,14 +1026,14 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param key the key to remove
*/
public void removeFromBackupSchedule(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.remove_from_backup_schedule";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -1041,14 +1042,14 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param key the key to remove
*/
public void removeFromArchiveTargetConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.remove_from_archive_target_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -1057,14 +1058,14 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param key the key to remove
*/
public void removeFromArchiveSchedule(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.remove_from_archive_schedule";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -1073,14 +1074,14 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param key the key to remove
*/
public void removeFromAlarmConfig(Connection c, String key) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.remove_from_alarm_config";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -1089,14 +1090,14 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param value the value to set
*/
public void setBackupLastRunTime(Connection c, Date value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_backup_last_run_time";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1105,14 +1106,14 @@ public class VMPP extends XenAPIObject {
}
/**
- *
+ *
*
* @param value the value to set
*/
public void setArchiveLastRunTime(Connection c, Date value) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.set_archive_last_run_time";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -1126,15 +1127,15 @@ public class VMPP extends XenAPIObject {
* @return references to all objects
*/
public static Set<VMPP> getAll(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_all";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toSetOfVMPP(result);
+ return Types.toSetOfVMPP(result);
}
/**
@@ -1143,15 +1144,15 @@ public class VMPP extends XenAPIObject {
* @return records of all objects
*/
public static Map<VMPP, VMPP.Record> getAllRecords(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VMPP.get_all_records";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toMapOfVMPPVMPPRecord(result);
+ return Types.toMapOfVMPPVMPPRecord(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/VTPM.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/VTPM.java b/deps/XenServerJava/src/com/xensource/xenapi/VTPM.java
index 25c3320..4ee7b2f 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/VTPM.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/VTPM.java
@@ -1,19 +1,19 @@
/*
* Copyright (c) Citrix Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1) Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials
* provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class VTPM extends XenAPIObject {
* For internal use only.
*/
VTPM(String ref) {
- this.ref = ref;
+ this.ref = ref;
}
/**
* @return The XenAPI reference (OpaqueRef) to this object.
*/
public String toWireString() {
- return this.ref;
+ return this.ref;
}
/**
@@ -78,7 +79,7 @@ public class VTPM extends XenAPIObject {
{
if (obj != null && obj instanceof VTPM)
{
- VTPM other = (VTPM)obj;
+ VTPM other = (VTPM) obj;
return other.ref.equals(this.ref);
} else
{
@@ -108,8 +109,8 @@ public class VTPM extends XenAPIObject {
/**
* Convert a VTPM.Record to a Map
*/
- public Map<String, Object> toMap() {
- Map<String, Object> map = new HashMap<String, Object>();
+ public Map<String,Object> toMap() {
+ Map<String,Object> map = new HashMap<String,Object>();
map.put("uuid", this.uuid == null ? "" : this.uuid);
map.put("VM", this.VM == null ? new VM("OpaqueRef:NULL") : this.VM);
map.put("backend", this.backend == null ? new VM("OpaqueRef:NULL") : this.backend);
@@ -136,15 +137,15 @@ public class VTPM extends XenAPIObject {
* @return all fields from the object
*/
public VTPM.Record getRecord(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VTPM.get_record";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVTPMRecord(result);
+ return Types.toVTPMRecord(result);
}
/**
@@ -154,15 +155,15 @@ public class VTPM extends XenAPIObject {
* @return reference to the object
*/
public static VTPM getByUuid(Connection c, String uuid) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VTPM.get_by_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVTPM(result);
+ return Types.toVTPM(result);
}
/**
@@ -172,9 +173,9 @@ public class VTPM extends XenAPIObject {
* @return Task
*/
public static Task createAsync(Connection c, VTPM.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VTPM.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
@@ -191,16 +192,16 @@ public class VTPM extends XenAPIObject {
* @return reference to the newly created object
*/
public static VTPM create(Connection c, VTPM.Record record) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VTPM.create";
String session = c.getSessionReference();
Map<String, Object> record_map = record.toMap();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(record_map)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVTPM(result);
+ return Types.toVTPM(result);
}
/**
@@ -209,9 +210,9 @@ public class VTPM extends XenAPIObject {
* @return Task
*/
public Task destroyAsync(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "Async.VTPM.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -225,9 +226,9 @@ public class VTPM extends XenAPIObject {
*
*/
public void destroy(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VTPM.destroy";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -241,15 +242,15 @@ public class VTPM extends XenAPIObject {
* @return value of the field
*/
public String getUuid(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VTPM.get_uuid";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toString(result);
+ return Types.toString(result);
}
/**
@@ -258,15 +259,15 @@ public class VTPM extends XenAPIObject {
* @return value of the field
*/
public VM getVM(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VTPM.get_VM";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
/**
@@ -275,15 +276,15 @@ public class VTPM extends XenAPIObject {
* @return value of the field
*/
public VM getBackend(Connection c) throws
- BadServerResponse,
- XenAPIException,
- XmlRpcException {
+ BadServerResponse,
+ XenAPIException,
+ XmlRpcException {
String method_call = "VTPM.get_backend";
String session = c.getSessionReference();
Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
Map response = c.dispatch(method_call, method_params);
Object result = response.get("Value");
- return Types.toVM(result);
+ return Types.toVM(result);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/XenAPIObject.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/XenAPIObject.java b/deps/XenServerJava/src/com/xensource/xenapi/XenAPIObject.java
old mode 100644
new mode 100755
index b9821ee..815a874
--- a/deps/XenServerJava/src/com/xensource/xenapi/XenAPIObject.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/XenAPIObject.java
@@ -1,18 +1,36 @@
-// Copyright 2012 Citrix Systems, Inc. Licensed under the
-// Apache License, Version 2.0 (the "License"); you may not use this
-// file except in compliance with the License. Citrix Systems, Inc.
-// reserves all rights not expressly granted by the License.
-// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Automatically generated by addcopyright.py at 04/03/2012
+/*
+ * Copyright (c) Citrix Systems, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1) Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2) Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
package com.xensource.xenapi;
public abstract class XenAPIObject
{
- public abstract String toWireString();
+ public abstract String toWireString();
}