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:50:28 UTC

[41/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to e90d595

- 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());