Repository: cloudstack Updated Branches: refs/heads/master 307a35a61 -> 37b9f91e5
CLOUDSTACK-7798: requestHasSensitiveInfo and responseHasSensitiveInfo annotation are missing from some separate Admin API commands. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/37b9f91e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/37b9f91e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/37b9f91e Branch: refs/heads/master Commit: 37b9f91e57d715d17db544bb4fb22516aee18895 Parents: 307a35a Author: Min Chen <[email protected]> Authored: Mon Oct 27 16:00:53 2014 -0700 Committer: Min Chen <[email protected]> Committed: Mon Oct 27 16:49:44 2014 -0700 ---------------------------------------------------------------------- .../api/command/admin/account/ListAccountsCmdByAdmin.java | 5 ++++- .../api/command/admin/address/AssociateIPAddrCmdByAdmin.java | 3 ++- .../command/admin/address/ListPublicIpAddressesCmdByAdmin.java | 3 ++- .../admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java | 6 +++++- .../cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java | 3 ++- .../cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java | 3 ++- .../api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java | 4 +++- .../cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java | 3 ++- .../api/command/admin/iso/RegisterIsoCmdByAdmin.java | 3 ++- .../cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java | 3 ++- .../loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java | 4 +++- .../api/command/admin/network/CreateNetworkCmdByAdmin.java | 3 ++- .../api/command/admin/network/ListNetworksCmdByAdmin.java | 3 ++- .../api/command/admin/network/UpdateNetworkCmdByAdmin.java | 3 ++- .../api/command/admin/template/CopyTemplateCmdByAdmin.java | 3 ++- .../api/command/admin/template/CreateTemplateCmdByAdmin.java | 3 ++- .../admin/template/ListTemplatePermissionsCmdByAdmin.java | 4 +++- .../api/command/admin/template/ListTemplatesCmdByAdmin.java | 3 ++- .../api/command/admin/template/RegisterTemplateCmdByAdmin.java | 3 ++- .../api/command/admin/template/UpdateTemplateCmdByAdmin.java | 3 ++- .../cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java | 4 +++- .../cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java | 5 ++++- .../cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java | 4 +++- .../cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java | 4 +++- .../api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java | 5 +++-- .../api/command/admin/vm/ResetVMPasswordCmdByAdmin.java | 4 +++- .../api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java | 4 +++- .../cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java | 5 ++++- .../cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java | 4 +++- .../cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java | 4 +++- .../cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java | 4 +++- .../api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java | 5 +++-- .../cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java | 4 +++- .../cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java | 4 +++- .../command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java | 3 ++- .../api/command/admin/volume/AttachVolumeCmdByAdmin.java | 4 +++- .../api/command/admin/volume/DetachVolumeCmdByAdmin.java | 4 +++- .../api/command/admin/volume/ListVolumesCmdByAdmin.java | 4 +++- .../api/command/admin/volume/MigrateVolumeCmdByAdmin.java | 3 ++- .../api/command/admin/volume/ResizeVolumeCmdByAdmin.java | 3 ++- .../api/command/admin/volume/UpdateVolumeCmdByAdmin.java | 3 ++- .../api/command/admin/volume/UploadVolumeCmdByAdmin.java | 3 ++- .../cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java | 3 ++- .../cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java | 3 ++- .../cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java | 3 ++- .../cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java | 3 ++- 46 files changed, 119 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java index 555567b..09a626a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java @@ -21,6 +21,9 @@ import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.command.user.account.ListAccountsCmd; import org.apache.cloudstack.api.response.AccountResponse; -@APICommand(name = "listAccounts", description = "Lists accounts and provides detailed account information for listed accounts", responseObject = AccountResponse.class, responseView = ResponseView.Full) +import com.cloud.user.Account; + +@APICommand(name = "listAccounts", description = "Lists accounts and provides detailed account information for listed accounts", responseObject = AccountResponse.class, responseView = ResponseView.Full, entityType = {Account.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class ListAccountsCmdByAdmin extends ListAccountsCmd { } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java index dbff93f..e428ac8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java @@ -32,7 +32,8 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.IpAddress; -@APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class, responseView = ResponseView.Full) +@APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AssociateIPAddrCmdByAdmin extends AssociateIPAddrCmd { public static final Logger s_logger = Logger.getLogger(AssociateIPAddrCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java index 3762e5f..22627a2 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java @@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.ListResponse; import com.cloud.network.IpAddress; import com.cloud.utils.Pair; -@APICommand(name = "listPublicIpAddresses", description = "Lists all public ip addresses", responseObject = IPAddressResponse.class, responseView = ResponseView.Full) +@APICommand(name = "listPublicIpAddresses", description = "Lists all public ip addresses", responseObject = IPAddressResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, entityType = {IpAddress.class}) public class ListPublicIpAddressesCmdByAdmin extends ListPublicIpAddressesCmd { public static final Logger s_logger = Logger.getLogger(ListPublicIpAddressesCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java index 85b8dd7..b0a6cae 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java @@ -33,10 +33,14 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; @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, responseView = ResponseView.Full) + + "new properties to take effect.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, + entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, + responseHasSensitiveInfo = true) public class UpdateVMAffinityGroupCmdByAdmin extends UpdateVMAffinityGroupCmd { public static final Logger s_logger = Logger.getLogger(UpdateVMAffinityGroupCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java index 7c3db62..2a58508 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java @@ -29,7 +29,8 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.uservm.UserVm; -@APICommand(name = "attachIso", description = "Attaches an ISO to a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Full) +@APICommand(name = "attachIso", description = "Attaches an ISO to a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class AttachIsoCmdByAdmin extends AttachIsoCmd { public static final Logger s_logger = Logger.getLogger(AttachIsoCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java index 144e3f9..2486680 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java @@ -28,7 +28,8 @@ import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.uservm.UserVm; -@APICommand(name = "detachIso", description = "Detaches any ISO file (if any) currently attached to a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Full) +@APICommand(name = "detachIso", description = "Detaches any ISO file (if any) currently attached to a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class DetachIsoCmdByAdmin extends DetachIsoCmd { public static final Logger s_logger = Logger.getLogger(DetachIsoCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java index 613a4a7..0b3c9ef 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java @@ -21,7 +21,9 @@ import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.command.user.iso.ListIsoPermissionsCmd; import org.apache.cloudstack.api.response.TemplatePermissionsResponse; -@APICommand(name = "listIsoPermissions", description = "List iso visibility and all accounts that have permissions to view this iso.", responseObject = TemplatePermissionsResponse.class, responseView = ResponseView.Full) +@APICommand(name = "listIsoPermissions", description = "List iso visibility and all accounts that have permissions to view this iso.", responseObject = TemplatePermissionsResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, + responseHasSensitiveInfo = false) public class ListIsoPermissionsCmdByAdmin extends ListIsoPermissionsCmd { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java index 6d87bcd..621fe01 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java @@ -21,6 +21,7 @@ import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.command.user.iso.ListIsosCmd; import org.apache.cloudstack.api.response.TemplateResponse; -@APICommand(name = "listIsos", description = "Lists all available ISO files.", responseObject = TemplateResponse.class, responseView = ResponseView.Full) +@APICommand(name = "listIsos", description = "Lists all available ISO files.", responseObject = TemplateResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListIsosCmdByAdmin extends ListIsosCmd { } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java index 79687f1..daae959 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java @@ -31,7 +31,8 @@ import org.apache.cloudstack.api.response.TemplateResponse; 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.", responseView = ResponseView.Full) +@APICommand(name = "registerIso", responseObject = TemplateResponse.class, description = "Registers an existing ISO into the CloudStack Cloud.", responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class RegisterIsoCmdByAdmin extends RegisterIsoCmd { public static final Logger s_logger = Logger.getLogger(RegisterIsoCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java index 1caf398..d3ec820 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java @@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.template.VirtualMachineTemplate; -@APICommand(name = "updateIso", description = "Updates an ISO file.", responseObject = TemplateResponse.class, responseView = ResponseView.Full) +@APICommand(name = "updateIso", description = "Updates an ISO file.", responseObject = TemplateResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateIsoCmdByAdmin extends UpdateIsoCmd { public static final Logger s_logger = Logger.getLogger(UpdateIsoCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java index 6c0d8a4..1bece18 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java @@ -32,7 +32,9 @@ import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; -@APICommand(name = "listLoadBalancerRuleInstances", description = "List all virtual machine instances that are assigned to a load balancer rule.", responseObject = LoadBalancerRuleVmMapResponse.class, responseView = ResponseView.Full) +@APICommand(name = "listLoadBalancerRuleInstances", description = "List all virtual machine instances that are assigned to a load balancer rule.", responseObject = LoadBalancerRuleVmMapResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, + responseHasSensitiveInfo = true) public class ListLoadBalancerRuleInstancesCmdByAdmin extends ListLoadBalancerRuleInstancesCmd { public static final Logger s_logger = Logger.getLogger (ListLoadBalancerRuleInstancesCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java index c129d6a..6cf9e23 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java @@ -32,7 +32,8 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; import com.cloud.network.Network; -@APICommand(name = "createNetwork", description = "Creates a network", responseObject = NetworkResponse.class, responseView = ResponseView.Full) +@APICommand(name = "createNetwork", description = "Creates a network", responseObject = NetworkResponse.class, responseView = ResponseView.Full, entityType = {Network.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateNetworkCmdByAdmin extends CreateNetworkCmd { public static final Logger s_logger = Logger.getLogger(CreateNetworkCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java index 3c31e68..244352f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java @@ -30,7 +30,8 @@ import org.apache.cloudstack.api.response.NetworkResponse; import com.cloud.network.Network; import com.cloud.utils.Pair; -@APICommand(name = "listNetworks", description = "Lists all available networks.", responseObject = NetworkResponse.class, responseView = ResponseView.Full) +@APICommand(name = "listNetworks", description = "Lists all available networks.", responseObject = NetworkResponse.class, responseView = ResponseView.Full, entityType = {Network.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListNetworksCmdByAdmin extends ListNetworksCmd { public static final Logger s_logger = Logger.getLogger(ListNetworksCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java index 644a0fa..269f43e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java @@ -33,7 +33,8 @@ import com.cloud.network.Network; import com.cloud.user.Account; import com.cloud.user.User; -@APICommand(name = "updateNetwork", description = "Updates a network", responseObject = NetworkResponse.class, responseView = ResponseView.Full) +@APICommand(name = "updateNetwork", description = "Updates a network", responseObject = NetworkResponse.class, responseView = ResponseView.Full, entityType = {Network.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateNetworkCmdByAdmin extends UpdateNetworkCmd { public static final Logger s_logger = Logger.getLogger(UpdateNetworkCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java index c6a5ee7..11c00e3 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java @@ -32,7 +32,8 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.StorageUnavailableException; import com.cloud.template.VirtualMachineTemplate; -@APICommand(name = "copyTemplate", description = "Copies a template from one zone to another.", responseObject = TemplateResponse.class, responseView = ResponseView.Full) +@APICommand(name = "copyTemplate", description = "Copies a template from one zone to another.", responseObject = TemplateResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CopyTemplateCmdByAdmin extends CopyTemplateCmd { public static final Logger s_logger = Logger.getLogger(CopyTemplateCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java index d316278..51d9c8d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java @@ -31,7 +31,8 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.template.VirtualMachineTemplate; @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.", responseView = ResponseView.Full) + + "A template created from this command is automatically designated as a private template visible to the account that created it.", responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateTemplateCmdByAdmin extends CreateTemplateCmd { public static final Logger s_logger = Logger.getLogger(CreateTemplateCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java index 1b6fbab..08e2ee8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java @@ -21,7 +21,9 @@ import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.command.user.template.ListTemplatePermissionsCmd; import org.apache.cloudstack.api.response.TemplatePermissionsResponse; -@APICommand(name = "listTemplatePermissions", description = "List template visibility and all accounts that have permissions to view this template.", responseObject = TemplatePermissionsResponse.class, responseView = ResponseView.Full) +@APICommand(name = "listTemplatePermissions", description = "List template visibility and all accounts that have permissions to view this template.", responseObject = TemplatePermissionsResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, + responseHasSensitiveInfo = false) public class ListTemplatePermissionsCmdByAdmin extends ListTemplatePermissionsCmd { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java index 4e2bb01..1469fe2 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java @@ -23,7 +23,8 @@ import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.template.VirtualMachineTemplate; -@APICommand(name = "listTemplates", description = "List all public, private, and privileged templates.", responseObject = TemplateResponse.class, entityType = {VirtualMachineTemplate.class}, responseView = ResponseView.Full) +@APICommand(name = "listTemplates", description = "List all public, private, and privileged templates.", responseObject = TemplateResponse.class, entityType = {VirtualMachineTemplate.class}, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListTemplatesCmdByAdmin extends ListTemplatesCmd { } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java index c623938..659d1c5 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java @@ -32,7 +32,8 @@ import org.apache.cloudstack.api.response.TemplateResponse; 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, responseView = ResponseView.Full) +@APICommand(name = "registerTemplate", description = "Registers an existing template into the CloudStack cloud. ", responseObject = TemplateResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class RegisterTemplateCmdByAdmin extends RegisterTemplateCmd { public static final Logger s_logger = Logger.getLogger(RegisterTemplateCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java index 6587020..94f8ff2 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java @@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.template.VirtualMachineTemplate; -@APICommand(name = "updateTemplate", description = "Updates attributes of a template.", responseObject = TemplateResponse.class, responseView = ResponseView.Full) +@APICommand(name = "updateTemplate", description = "Updates attributes of a template.", responseObject = TemplateResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateTemplateCmdByAdmin extends UpdateTemplateCmd { public static final Logger s_logger = Logger.getLogger(UpdateTemplateCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java index 77aa20f..03bb4c6 100755 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java @@ -31,9 +31,11 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InsufficientServerCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class, responseView = ResponseView.Full) +@APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class DeployVMCmdByAdmin extends DeployVMCmd { public static final Logger s_logger = Logger.getLogger(DeployVMCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java index b14e5b0..73a80d5 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java @@ -31,8 +31,11 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "destroyVirtualMachine", description = "Destroys a virtual machine. Once destroyed, only the administrator can recover it.", responseObject = UserVmResponse.class, responseView = ResponseView.Full) +@APICommand(name = "destroyVirtualMachine", description = "Destroys a virtual machine. Once destroyed, only the administrator can recover it.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, + responseHasSensitiveInfo = true) public class DestroyVMCmdByAdmin extends DestroyVMCmd { public static final Logger s_logger = Logger.getLogger(DestroyVMCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java index 489af29..f41e196 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java @@ -28,8 +28,10 @@ import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.UserVmResponse; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "listVirtualMachines", description = "List the virtual machines owned by the account.", responseObject = UserVmResponse.class, responseView = ResponseView.Full) +@APICommand(name = "listVirtualMachines", description = "List the virtual machines owned by the account.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class ListVMsCmdByAdmin extends ListVMsCmd { public static final Logger s_logger = Logger.getLogger(ListVMsCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java index 7fa8eda..e0c3668 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java @@ -29,8 +29,10 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "rebootVirtualMachine", description = "Reboots a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Full) +@APICommand(name = "rebootVirtualMachine", description = "Reboots a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class RebootVMCmdByAdmin extends RebootVMCmd { public static final Logger s_logger = Logger.getLogger(RebootVMCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java index ba0ff27..ff1c54c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java @@ -31,9 +31,10 @@ import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "removeNicFromVirtualMachine", description = "Removes VM from specified network by deleting a NIC", responseObject = UserVmResponse.class, responseView = ResponseView.Full) - +@APICommand(name = "removeNicFromVirtualMachine", description = "Removes VM from specified network by deleting a NIC", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class RemoveNicFromVMCmdByAdmin extends RemoveNicFromVMCmd { public static final Logger s_logger = Logger.getLogger(RemoveNicFromVMCmdByAdmin.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java index 1b3e1cc..a53e61a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java @@ -29,10 +29,12 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; @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]", responseView = ResponseView.Full) + "support this feature for this command to take effect. [async]", responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class ResetVMPasswordCmdByAdmin extends ResetVMPasswordCmd { public static final Logger s_logger = Logger.getLogger(ResetVMPasswordCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java index 1da083c..35c47ed 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java @@ -30,9 +30,11 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; @APICommand(name = "resetSSHKeyForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the SSH Key for virtual machine. " + - "The virtual machine must be in a \"Stopped\" state. [async]", responseView = ResponseView.Full) + "The virtual machine must be in a \"Stopped\" state. [async]", responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class ResetVMSSHKeyCmdByAdmin extends ResetVMSSHKeyCmd { public static final Logger s_logger = Logger.getLogger(ResetVMSSHKeyCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java index fea2016..9a741b6 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java @@ -31,8 +31,11 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "restoreVirtualMachine", description = "Restore a VM to original template/ISO or new template/ISO", responseObject = UserVmResponse.class, since = "3.0.0", responseView = ResponseView.Full) +@APICommand(name = "restoreVirtualMachine", description = "Restore a VM to original template/ISO or new template/ISO", responseObject = UserVmResponse.class, since = "3.0.0", responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, + responseHasSensitiveInfo = true) public class RestoreVMCmdByAdmin extends RestoreVMCmd { public static final Logger s_logger = Logger.getLogger(RestoreVMCmdByAdmin.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java index 68d3c33..f434fdf 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java @@ -33,9 +33,11 @@ import com.cloud.exception.ManagementServerException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.VirtualMachineMigrationException; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class, responseView = ResponseView.Full) +@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ScaleVMCmdByAdmin extends ScaleVMCmd { public static final Logger s_logger = Logger.getLogger(ScaleVMCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java index e814784..f968835 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java @@ -34,8 +34,10 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.StorageUnavailableException; import com.cloud.uservm.UserVm; import com.cloud.utils.exception.ExecutionException; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "startVirtualMachine", responseObject = UserVmResponse.class, description = "Starts a virtual machine.", responseView = ResponseView.Full) +@APICommand(name = "startVirtualMachine", responseObject = UserVmResponse.class, description = "Starts a virtual machine.", responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class StartVMCmdByAdmin extends StartVMCmd { public static final Logger s_logger = Logger.getLogger(StartVMCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java index 6c906c7..4cd1418 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java @@ -28,8 +28,10 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.exception.ConcurrentOperationException; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "stopVirtualMachine", responseObject = UserVmResponse.class, description = "Stops a virtual machine.", responseView = ResponseView.Full) +@APICommand(name = "stopVirtualMachine", responseObject = UserVmResponse.class, description = "Stops a virtual machine.", responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class StopVMCmdByAdmin extends StopVMCmd { public static final Logger s_logger = Logger.getLogger(StopVMCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java index 82385ba..9a06309 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java @@ -31,9 +31,10 @@ import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.context.CallContext; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "updateDefaultNicForVirtualMachine", description = "Changes the default NIC on a VM", responseObject = UserVmResponse.class, responseView = ResponseView.Full) - +@APICommand(name = "updateDefaultNicForVirtualMachine", description = "Changes the default NIC on a VM", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class UpdateDefaultNicForVMCmdByAdmin extends UpdateDefaultNicForVMCmd { public static final Logger s_logger = Logger.getLogger(UpdateDefaultNicForVMCmdByAdmin.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java index ef598b1..fcafef8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java @@ -29,11 +29,13 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; @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, responseView = ResponseView.Full) + "Therefore, stop the VM manually before issuing this call.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class UpdateVMCmdByAdmin extends UpdateVMCmd { public static final Logger s_logger = Logger.getLogger(UpdateVMCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java index bfbe3d6..6df400a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java @@ -30,10 +30,12 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.offering.ServiceOffering; import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; @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.", responseView = ResponseView.Full) + "this command to take effect.", responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class UpgradeVMCmdByAdmin extends UpgradeVMCmd { public static final Logger s_logger = Logger.getLogger(UpgradeVMCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java index 92df872..facce1e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java @@ -32,7 +32,8 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.uservm.UserVm; -@APICommand(name = "revertToVMSnapshot", description = "Revert VM from a vmsnapshot.", responseObject = UserVmResponse.class, since = "4.2.0", responseView = ResponseView.Full) +@APICommand(name = "revertToVMSnapshot", description = "Revert VM from a vmsnapshot.", responseObject = UserVmResponse.class, since = "4.2.0", responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) public class RevertToVMSnapshotCmdByAdmin extends RevertToVMSnapshotCmd { public static final Logger s_logger = Logger .getLogger(RevertToVMSnapshotCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java index 3634a97..c51c1e2 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java @@ -27,8 +27,10 @@ import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; import com.cloud.storage.Volume; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "attachVolume", description = "Attaches a disk volume to a virtual machine.", responseObject = VolumeResponse.class, responseView = ResponseView.Full) +@APICommand(name = "attachVolume", description = "Attaches a disk volume to a virtual machine.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class AttachVolumeCmdByAdmin extends AttachVolumeCmd { public static final Logger s_logger = Logger.getLogger(AttachVolumeCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java index ab07a78..353a068 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java @@ -27,8 +27,10 @@ import org.apache.cloudstack.api.response.VolumeResponse; import org.apache.cloudstack.context.CallContext; import com.cloud.storage.Volume; +import com.cloud.vm.VirtualMachine; -@APICommand(name = "detachVolume", description = "Detaches a disk volume from a virtual machine.", responseObject = VolumeResponse.class, responseView = ResponseView.Full) +@APICommand(name = "detachVolume", description = "Detaches a disk volume from a virtual machine.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DetachVolumeCmdByAdmin extends DetachVolumeCmd { public static final Logger s_logger = Logger.getLogger(DetachVolumeCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java index 1cd54d1..5fe5bfe 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java @@ -28,9 +28,11 @@ import org.apache.cloudstack.api.response.PodResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.VolumeResponse; +import com.cloud.storage.Volume; -@APICommand(name = "listVolumes", description = "Lists all volumes.", responseObject = VolumeResponse.class, responseView = ResponseView.Full) +@APICommand(name = "listVolumes", description = "Lists all volumes.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {Volume.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListVolumesCmdByAdmin extends ListVolumesCmd { public static final Logger s_logger = Logger.getLogger(ListVolumesCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java index 44a08e8..c312cfc 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java @@ -26,7 +26,8 @@ import org.apache.cloudstack.api.response.VolumeResponse; import com.cloud.storage.Volume; -@APICommand(name = "migrateVolume", description = "Migrate volume", responseObject = VolumeResponse.class, since = "3.0.0", responseView = ResponseView.Full) +@APICommand(name = "migrateVolume", description = "Migrate volume", responseObject = VolumeResponse.class, since = "3.0.0", responseView = ResponseView.Full, entityType = {Volume.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class MigrateVolumeCmdByAdmin extends MigrateVolumeCmd { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java index 542fff5..6ef142f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java @@ -29,7 +29,8 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.storage.Volume; -@APICommand(name = "resizeVolume", description = "Resizes a volume", responseObject = VolumeResponse.class, responseView = ResponseView.Full) +@APICommand(name = "resizeVolume", description = "Resizes a volume", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {Volume.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ResizeVolumeCmdByAdmin extends ResizeVolumeCmd { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java index 16b2d5d..6b110e5 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java @@ -26,7 +26,8 @@ import org.apache.cloudstack.context.CallContext; import com.cloud.storage.Volume; -@APICommand(name = "updateVolume", description = "Updates the volume.", responseObject = VolumeResponse.class, responseView = ResponseView.Full) +@APICommand(name = "updateVolume", description = "Updates the volume.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {Volume.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateVolumeCmdByAdmin extends UpdateVolumeCmd { @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java index e3e0c9b..f26e465 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java @@ -32,7 +32,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, responseView = ResponseView.Full) +@APICommand(name = "uploadVolume", description = "Uploads a data disk.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {Volume.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UploadVolumeCmdByAdmin extends UploadVolumeCmd { public static final Logger s_logger = Logger.getLogger(UploadVolumeCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java index b7f33bf..a84a3aa5 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java @@ -31,7 +31,8 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.vpc.Vpc; -@APICommand(name = "createVPC", description = "Creates a VPC", responseObject = VpcResponse.class, responseView = ResponseView.Full) +@APICommand(name = "createVPC", description = "Creates a VPC", responseObject = VpcResponse.class, responseView = ResponseView.Full, entityType = {Vpc.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateVPCCmdByAdmin extends CreateVPCCmd { public static final Logger s_logger = Logger.getLogger(CreateVPCCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java index 02f47a2..20d77a7 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java @@ -30,7 +30,8 @@ import com.cloud.network.vpc.Vpc; import com.cloud.utils.Pair; -@APICommand(name = "listVPCs", description = "Lists VPCs", responseObject = VpcResponse.class, responseView = ResponseView.Full) +@APICommand(name = "listVPCs", description = "Lists VPCs", responseObject = VpcResponse.class, responseView = ResponseView.Full, entityType = {Vpc.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListVPCsCmdByAdmin extends ListVPCsCmd { public static final Logger s_logger = Logger.getLogger(ListVPCsCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java index b94cdcf..8606c32 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java @@ -27,7 +27,8 @@ import org.apache.cloudstack.api.response.VpcResponse; import com.cloud.network.vpc.Vpc; -@APICommand(name = "updateVPC", description = "Updates a VPC", responseObject = VpcResponse.class, responseView = ResponseView.Full) +@APICommand(name = "updateVPC", description = "Updates a VPC", responseObject = VpcResponse.class, responseView = ResponseView.Full, entityType = {Vpc.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateVPCCmdByAdmin extends UpdateVPCCmd { public static final Logger s_logger = Logger.getLogger(UpdateVPCCmdByAdmin.class.getName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37b9f91e/api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java index 772a4dc..d0a7707 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java @@ -21,6 +21,7 @@ import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.command.user.zone.ListZonesCmd; import org.apache.cloudstack.api.response.ZoneResponse; -@APICommand(name = "listZones", description = "Lists zones", responseObject = ZoneResponse.class, responseView = ResponseView.Full) +@APICommand(name = "listZones", description = "Lists zones", responseObject = ZoneResponse.class, responseView = ResponseView.Full, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListZonesCmdByAdmin extends ListZonesCmd { }
