etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rbac.

This commit is contained in:
Min Chen 2014-03-06 14:02:20 -08:00
parent 695d689de5 63e3eea790
commit 48e08fe676
1189 changed files with 36469 additions and 22053 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in
View File

@ -24,12 +24,10 @@
. /etc/rc.d/init.d/functions
whatami=cloud-agent
# set environment variables
SHORTNAME="$whatami"
PIDFILE=@PIDDIR@/"$whatami".pid
SHORTNAME="$0"
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
LOCKFILE=@LOCKDIR@/"$SHORTNAME"
LOGFILE=@AGENTLOG@
PROGNAME="Cloud Agent"
@ -114,7 +112,7 @@ case "$1" in
fi
;;
*)
echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
RETVAL=3
esac

8
agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in
View File

@ -24,12 +24,10 @@
. /etc/rc.d/init.d/functions
whatami=cloud-agent
# set environment variables
SHORTNAME="$whatami"
PIDFILE=@PIDDIR@/"$whatami".pid
SHORTNAME="$0"
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
LOCKFILE=@LOCKDIR@/"$SHORTNAME"
LOGFILE=@AGENTLOG@
PROGNAME="Cloud Agent"
@ -114,7 +112,7 @@ case "$1" in
fi
;;
*)
echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
RETVAL=3
esac

8
agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
View File

@ -31,12 +31,10 @@
. /lib/lsb/init-functions
. /etc/rc.status
whatami=cloud-agent
# set environment variables
SHORTNAME="$whatami"
PIDFILE=@PIDDIR@/"$whatami".pid
SHORTNAME="$0"
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
LOCKFILE=@LOCKDIR@/"$SHORTNAME"
LOGFILE=@AGENTLOG@
PROGNAME="Cloud Agent"
@ -166,7 +164,7 @@ case "$1" in
start
;;
*)
echo $"Usage: $whatami {start|stop|restart|status|help}"
echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
RETVAL=3
esac

8
agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in
View File

@ -24,12 +24,10 @@
. /etc/rc.d/init.d/functions
whatami=cloud-agent
# set environment variables
SHORTNAME="$whatami"
PIDFILE=@PIDDIR@/"$whatami".pid
SHORTNAME="$0"
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
LOCKFILE=@LOCKDIR@/"$SHORTNAME"
LOGFILE=@AGENTLOG@
PROGNAME="Cloud Agent"
@ -114,7 +112,7 @@ case "$1" in
fi
;;
*)
echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
RETVAL=3
esac

8
agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
View File

@ -31,12 +31,10 @@
. /lib/lsb/init-functions
. /etc/rc.status
whatami=cloud-agent
# set environment variables
SHORTNAME="$whatami"
PIDFILE=@PIDDIR@/"$whatami".pid
SHORTNAME="$0"
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
LOCKFILE=@LOCKDIR@/"$SHORTNAME"
LOGFILE=@AGENTLOG@
PROGNAME="Cloud Agent"
@ -166,7 +164,7 @@ case "$1" in
start
;;
*)
echo $"Usage: $whatami {start|stop|restart|status|help}"
echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
RETVAL=3
esac

1
api/src/com/cloud/event/EventTypes.java
View File

@ -455,6 +455,7 @@ public class EventTypes {
public static final String EVENT_UCS_ASSOCIATED_PROFILE = "UCS.ASSOCIATEPROFILE";
// IAM events
public static final String EVENT_IAM_POLICY_CREATE = "IAMPOLICY.CREATE";
public static final String EVENT_IAM_POLICY_DELETE = "IAMPOLICY.DELETE";
public static final String EVENT_IAM_POLICY_GRANT = "IAMPOLICY.GRANT";

2
api/src/com/cloud/network/IpAddress.java
View File

@ -85,4 +85,6 @@ public interface IpAddress extends ControlledEntity, Identity, InternalIdentity
Long getNetworkId();
boolean isDisplay();
}

4
api/src/com/cloud/network/NetworkService.java
View File

@ -50,7 +50,7 @@ public interface NetworkService {
List<? extends Network> getIsolatedNetworksOwnedByAccountInZone(long zoneId, Account owner);
IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) throws ResourceAllocationException, InsufficientAddressCapacityException,
IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId, Boolean displayIp) throws ResourceAllocationException, InsufficientAddressCapacityException,
ConcurrentOperationException;
boolean releaseIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
@ -177,5 +177,5 @@ public interface NetworkService {
Map<Network.Capability, String> getNetworkOfferingServiceCapabilities(NetworkOffering offering, Service service);
IpAddress updateIP(Long id, String customId);
IpAddress updateIP(Long id, String customId, Boolean displayIp);
}

2
api/src/com/cloud/network/RemoteAccessVpn.java
View File

@ -38,4 +38,6 @@ public interface RemoteAccessVpn extends ControlledEntity, InternalIdentity, Ide
Long getVpcId();
State getState();
boolean isDisplay();
}

2
api/src/com/cloud/network/Site2SiteVpnConnection.java
View File

@ -42,4 +42,6 @@ public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdenti
public Date getRemoved();
public boolean isPassive();
boolean isDisplay();
}

5
api/src/com/cloud/network/Site2SiteVpnGateway.java
View File

@ -1,3 +1,4 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
@ -15,17 +16,19 @@
// specific language governing permissions and limitations
// under the License.
package com.cloud.network;
import java.util.Date;
import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
public interface Site2SiteVpnGateway extends ControlledEntity, Identity, InternalIdentity {
public long getAddrId();
public long getVpcId();
public Date getRemoved();
boolean isDisplay();
}

2
api/src/com/cloud/network/as/AutoScaleVmGroup.java
View File

@ -53,4 +53,6 @@ public interface AutoScaleVmGroup extends ControlledEntity, InternalIdentity {
String getUuid();
boolean isDisplay();
}

2
api/src/com/cloud/network/as/AutoScaleVmProfile.java
View File

@ -48,4 +48,6 @@ public interface AutoScaleVmProfile extends ControlledEntity, InternalIdentity {
public long getAutoScaleUserId();
boolean isDisplay();
}

2
api/src/com/cloud/network/firewall/FirewallService.java
View File

@ -50,6 +50,6 @@ public interface FirewallService {
boolean revokeRelatedFirewallRule(long ruleId, boolean apply);
FirewallRule updateFirewallRule(long ruleId, String customId);
FirewallRule updateFirewallRule(long ruleId, String customId, Boolean forDisplay);
}

5
api/src/com/cloud/network/lb/LoadBalancingRulesService.java
View File

@ -41,16 +41,17 @@ import com.cloud.utils.net.Ip;
public interface LoadBalancingRulesService {
/**
* Create a load balancer rule from the given ipAddress/port to the given private port
*
* @param openFirewall
* TODO
* @param forDisplay TODO
* @param cmd
* the command specifying the ip address, public port, protocol, private port, and algorithm
*
* @return the newly created LoadBalancerVO if successful, null otherwise
* @throws InsufficientAddressCapacityException
*/
LoadBalancer createPublicLoadBalancerRule(String xId, String name, String description, int srcPortStart, int srcPortEnd, int defPortStart, int defPortEnd,
Long ipAddrId, String protocol, String algorithm, long networkId, long lbOwnerId, boolean openFirewall, String lbProtocol) throws NetworkRuleConflictException,
Long ipAddrId, String protocol, String algorithm, long networkId, long lbOwnerId, boolean openFirewall, String lbProtocol, Boolean forDisplay) throws NetworkRuleConflictException,
InsufficientAddressCapacityException;
LoadBalancer updateLoadBalancerRule(UpdateLoadBalancerRuleCmd cmd);

2
api/src/com/cloud/network/rules/FirewallRule.java
View File

@ -87,4 +87,6 @@ public interface FirewallRule extends ControlledEntity, Identity, InternalIdenti
*/
TrafficType getTrafficType();
boolean isDisplay();
}

5
api/src/com/cloud/network/rules/RulesService.java
View File

@ -41,11 +41,12 @@ public interface RulesService {
* vm to be linked to. If specified the destination ip address is ignored.
* @param openFirewall
* TODO
* @param forDisplay TODO
* @return PortForwardingRule if created.
* @throws NetworkRuleConflictException
* if conflicts in the network rules are detected.
*/
PortForwardingRule createPortForwardingRule(PortForwardingRule rule, Long vmId, Ip vmIp, boolean openFirewall) throws NetworkRuleConflictException;
PortForwardingRule createPortForwardingRule(PortForwardingRule rule, Long vmId, Ip vmIp, boolean openFirewall, Boolean forDisplay) throws NetworkRuleConflictException;
/**
* Revokes a port forwarding rule
@ -80,6 +81,6 @@ public interface RulesService {
boolean disableStaticNat(long ipId) throws ResourceUnavailableException, NetworkRuleConflictException, InsufficientAddressCapacityException;
PortForwardingRule updatePortForwardingRule(long id, String customId);
PortForwardingRule updatePortForwardingRule(long id, String customId, Boolean forDisplay);
}

2
api/src/com/cloud/network/vpc/NetworkACL.java
View File

@ -33,4 +33,6 @@ public interface NetworkACL extends InternalIdentity {
long getId();
String getName();
boolean isDisplay();
}

2
api/src/com/cloud/network/vpc/NetworkACLItem.java
View File

@ -73,4 +73,6 @@ public interface NetworkACLItem extends InternalIdentity {
*/
TrafficType getTrafficType();
boolean isDisplay();
}

8
api/src/com/cloud/network/vpc/NetworkACLService.java
View File

@ -31,9 +31,10 @@ public interface NetworkACLService {
* @param name
* @param description
* @param vpcId
* @param forDisplay TODO
* @return
*/
NetworkACL createNetworkACL(String name, String description, long vpcId);
NetworkACL createNetworkACL(String name, String description, long vpcId, Boolean forDisplay);
/**
* Get Network ACL with specified Id
@ -115,11 +116,12 @@ public interface NetworkACLService {
* @param icmpCode
* @param icmpType
* @param newUUID TODO
* @param forDisplay TODO
* @return
* @throws ResourceUnavailableException
*/
NetworkACLItem updateNetworkACLItem(Long id, String protocol, List<String> sourceCidrList, NetworkACLItem.TrafficType trafficType, String action, Integer number,
Integer sourcePortStart, Integer sourcePortEnd, Integer icmpCode, Integer icmpType, String newUUID) throws ResourceUnavailableException;
Integer sourcePortStart, Integer sourcePortEnd, Integer icmpCode, Integer icmpType, String newUUID, Boolean forDisplay) throws ResourceUnavailableException;
/**
* Associates ACL with specified Network
@ -130,6 +132,6 @@ public interface NetworkACLService {
*/
boolean replaceNetworkACLonPrivateGw(long aclId, long privateGatewayId) throws ResourceUnavailableException;
NetworkACL updateNetworkACL(Long id, String customId);
NetworkACL updateNetworkACL(Long id, String customId, Boolean forDisplay);
}

1
api/src/com/cloud/network/vpc/StaticRouteProfile.java
View File

@ -107,5 +107,4 @@ public class StaticRouteProfile implements StaticRoute {
public IAMEntityType getEntityType() {
return IAMEntityType.StaticRoute;
}
}

1
api/src/com/cloud/network/vpc/Vpc.java
View File

@ -72,4 +72,5 @@ public interface Vpc extends ControlledEntity, Identity, InternalIdentity {
*/
boolean isRestartRequired();
boolean isDisplay();
}

9
api/src/com/cloud/network/vpc/VpcService.java
View File

@ -43,10 +43,11 @@ public interface VpcService {
* @param displayText
* @param cidr
* @param networkDomain TODO
* @param displayVpc TODO
* @return
* @throws ResourceAllocationException TODO
*/
public Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain)
public Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain, Boolean displayVpc)
throws ResourceAllocationException;
/**
@ -67,9 +68,10 @@ public interface VpcService {
* @param vpcName
* @param displayText
* @param customId TODO
* @param displayVpc TODO
* @return
*/
public Vpc updateVpc(long vpcId, String vpcName, String displayText, String customId);
public Vpc updateVpc(long vpcId, String vpcName, String displayText, String customId, Boolean displayVpc);
/**
* Lists VPC(s) based on the parameters passed to the method call
@ -91,12 +93,13 @@ public interface VpcService {
* @param restartRequired TODO
* @param tags TODO
* @param projectId TODO
* @param display TODO
* @param vpc
* @return
*/
public List<? extends Vpc> listVpcs(Long id, String vpcName, String displayText, List<String> supportedServicesStr, String cidr, Long vpcOffId, String state,
String accountName, Long domainId, String keyword, Long startIndex, Long pageSizeVal, Long zoneId, Boolean isRecursive, Boolean listAll, Boolean restartRequired,
Map<String, String> tags, Long projectId);
Map<String, String> tags, Long projectId, Boolean display);
/**
* Starts VPC which includes starting VPC provider and applying all the neworking rules on the backend

4
api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
View File

@ -31,7 +31,7 @@ import com.cloud.utils.Pair;
public interface RemoteAccessVpnService {
static final String RemoteAccessVpnClientIpRangeCK = "remote.access.vpn.client.iprange";
RemoteAccessVpn createRemoteAccessVpn(long vpnServerAddressId, String ipRange, boolean openFirewall) throws NetworkRuleConflictException;
RemoteAccessVpn createRemoteAccessVpn(long vpnServerAddressId, String ipRange, boolean openFirewall, Boolean forDisplay) throws NetworkRuleConflictException;
void destroyRemoteAccessVpnForIp(long vpnServerAddressId, Account caller) throws ResourceUnavailableException;
@ -55,6 +55,6 @@ public interface RemoteAccessVpnService {
RemoteAccessVpn getRemoteAccessVpnById(long vpnId);
RemoteAccessVpn updateRemoteAccessVpn(long id, String customId);
RemoteAccessVpn updateRemoteAccessVpn(long id, String customId, Boolean forDisplay);
}

4
api/src/com/cloud/network/vpn/Site2SiteVpnService.java
View File

@ -64,7 +64,7 @@ public interface Site2SiteVpnService {
Site2SiteCustomerGateway updateCustomerGateway(UpdateVpnCustomerGatewayCmd updateVpnCustomerGatewayCmd);
Site2SiteVpnConnection updateVpnConnection(long id, String customId);
Site2SiteVpnConnection updateVpnConnection(long id, String customId, Boolean forDisplay);
Site2SiteVpnGateway updateVpnGateway(Long id, String customId);
Site2SiteVpnGateway updateVpnGateway(Long id, String customId, Boolean forDisplay);
}

4
api/src/com/cloud/serializer/Param.java
View File

@ -19,6 +19,8 @@ package com.cloud.serializer;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import org.apache.cloudstack.acl.RoleType;
@Retention(RetentionPolicy.RUNTIME)
public @interface Param {
String name() default "";
@ -33,4 +35,6 @@ public @interface Param {
boolean includeInApiDoc() default true;
String since() default "";
RoleType[] authorized() default {};
}

4
api/src/com/cloud/server/ManagementService.java
View File

@ -269,9 +269,9 @@ public interface ManagementService {
*/
String generateRandomPassword();
public Long saveStartedEvent(Long userId, Long accountId, String type, String description, long startEventId);
public Long saveStartedEvent(Long userId, Long accountId, String type, String description, boolean startEventId, Long displayResourceEnabled);
public Long saveCompletedEvent(Long userId, Long accountId, String level, String type, String description, long startEventId);
public Long saveCompletedEvent(Long userId, Long accountId, String level, String type, String description, boolean displayResourceEnabled, long startEventId);
/**
* Search registered key pairs for the logged in user.

3
api/src/com/cloud/server/ResourceMetaDataService.java
View File

@ -30,9 +30,10 @@ public interface ResourceMetaDataService {
* @param resourceId TODO
* @param resourceType
* @param details
* @param forDisplay TODO
* @return
*/
boolean addResourceMetaData(String resourceId, ResourceObjectType resourceType, Map<String, String> details);
boolean addResourceMetaData(String resourceId, ResourceObjectType resourceType, Map<String, String> details, boolean forDisplay);
/**
*

3
api/src/com/cloud/storage/Storage.java
View File

@ -98,7 +98,8 @@ public class Storage {
PreSetup(true), // for XenServer, Storage Pool is set up by customers.
EXT(false), // XenServer local EXT SR
OCFS2(true),
SMB(true);
SMB(true),
Gluster(true);
boolean shared;

2
api/src/com/cloud/storage/Volume.java
View File

@ -190,4 +190,6 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity, Ba
Long getVmSnapshotChainSize();
Integer getHypervisorSnapshotReserve();
boolean isDisplayVolume();
}

2
api/src/com/cloud/storage/VolumeApiService.java
View File

@ -82,7 +82,7 @@ public interface VolumeApiService {
Snapshot allocSnapshot(Long volumeId, Long policyId) throws ResourceAllocationException;
Volume updateVolume(long volumeId, String path, String state, Long storageId, Boolean displayVolume, String customId, long owner);
Volume updateVolume(long volumeId, String path, String state, Long storageId, Boolean displayVolume, String customId, long owner, String chainInfo);
/**
* Extracts the volume to a particular location.

1
api/src/com/cloud/uservm/UserVm.java
View File

@ -39,4 +39,5 @@ public interface UserVm extends VirtualMachine, ControlledEntity {
void setAccountId(long accountId);
public boolean isDisplayVm();
}

5
api/src/com/cloud/vm/VirtualMachine.java
View File

@ -34,7 +34,10 @@ import com.cloud.utils.fsm.StateObject;
public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, InternalIdentity, StateObject<VirtualMachine.State> {
public enum PowerState {
PowerUnknown, PowerOn, PowerOff,
PowerUnknown,
PowerOn,
PowerOff,
PowerReportMissing
}
public enum State {

1
api/src/org/apache/cloudstack/acl/SecurityChecker.java
View File

@ -100,6 +100,7 @@ public interface SecurityChecker extends Adapter {
*/
boolean checkAccess(Account caller, ControlledEntity entity, AccessType accessType, String action) throws PermissionDeniedException;
/**
* Checks if the user belongs to an account that can access the object.
*

6
api/src/org/apache/cloudstack/api/APICommand.java
View File

@ -22,9 +22,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.cloudstack.acl.IAMEntityType;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.acl.IAMEntityType;
@Retention(RetentionPolicy.RUNTIME)
@Target({TYPE})
@ -43,6 +43,10 @@ public @interface APICommand {
ResponseView responseView() default ResponseView.Full;
boolean requestHasSensitiveInfo() default true;
boolean responseHasSensitiveInfo() default true;
RoleType[] authorized() default {};
IAMEntityType[] entityType() default {};

2
api/src/org/apache/cloudstack/api/ApiConstants.java
View File

@ -41,6 +41,7 @@ public class ApiConstants {
public static final String PRIVATE_KEY = "privatekey";
public static final String DOMAIN_SUFFIX = "domainsuffix";
public static final String DNS_SEARCH_ORDER = "dnssearchorder";
public static final String CHAIN_INFO = "chaininfo";
public static final String CIDR = "cidr";
public static final String IP6_CIDR = "ip6cidr";
public static final String CIDR_LIST = "cidrlist";
@ -543,6 +544,7 @@ public class ApiConstants {
public static final String ROUTING = "isrouting";
public static final String MAX_CONNECTIONS = "maxconnections";
public static final String SERVICE_STATE = "servicestate";
public static final String IAM_ACCOUNT_IDS = "accountids";
public static final String IAM_MEMBER_ACCOUNTS = "memberaccounts";
public static final String IAM_PARENT_POLICY_ID = "parentpolicyid";

6
api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
View File

@ -105,7 +105,8 @@ public abstract class BaseAsyncCmd extends BaseCmd {
if (startEvent == null) {
startEvent = 0L;
}
return _mgr.saveStartedEvent((userId == null) ? User.UID_SYSTEM : userId, getEntityOwnerId(), eventType, description, startEvent);
return _mgr.saveStartedEvent((userId == null) ? User.UID_SYSTEM : userId, getEntityOwnerId(), eventType, description,
isDisplayResourceEnabled(), startEvent);
}
protected long saveCompletedEvent(String level, String description) {
@ -120,7 +121,8 @@ public abstract class BaseAsyncCmd extends BaseCmd {
if (startEvent == null) {
startEvent = 0L;
}
return _mgr.saveCompletedEvent((userId == null) ? User.UID_SYSTEM : userId, getEntityOwnerId(), level, eventType, description, startEvent);
return _mgr.saveCompletedEvent((userId == null) ? User.UID_SYSTEM : userId, getEntityOwnerId(), level, eventType, description,
isDisplayResourceEnabled(), startEvent);
}
}

8
api/src/org/apache/cloudstack/api/BaseCmd.java
View File

@ -402,4 +402,12 @@ public abstract class BaseCmd {
}
return null;
}
/**
* display flag is used to control the display of the resource only to the end user. It doesnt affect Root Admin.
* @return display flag
*/
public boolean isDisplayResourceEnabled(){
return true;
}
}

12
api/src/org/apache/cloudstack/api/BaseListAccountResourcesCmd.java
View File

@ -16,6 +16,10 @@
// under the License.
package org.apache.cloudstack.api;
import org.apache.cloudstack.context.CallContext;
import com.cloud.user.Account;
public abstract class BaseListAccountResourcesCmd extends BaseListDomainResourcesCmd {
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "list resources by account. Must be used with the domainId parameter.")
@ -24,4 +28,12 @@ public abstract class BaseListAccountResourcesCmd extends BaseListDomainResource
public String getAccountName() {
return accountName;
}
public Boolean getDisplay() {
Account caller = CallContext.current().getCallingAccount();
if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {
return true;
}
return null;
}
}

4
api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
View File

@ -36,7 +36,9 @@ 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, entityType = { IAMEntityType.Account })
@APICommand(name = "createAccount", description = "Creates an account", responseObject = AccountResponse.class, entityType = {IAMEntityType.Account},
requestHasSensitiveInfo = true, responseHasSensitiveInfo = true)
public class CreateAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateAccountCmd.class.getName());

5
api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
View File

@ -39,7 +39,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, entityType = { IAMEntityType.Account })
@APICommand(name = "deleteAccount", description = "Deletes a account, and all users associated with this account", responseObject = SuccessResponse.class, entityType = {IAMEntityType.Account},
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";
@ -104,7 +105,7 @@ public class DeleteAccountCmd extends BaseAsyncCmd {
boolean result = _regionService.deleteUserAccount(this);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete user account and all corresponding users");
}

3
api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
View File

@ -41,7 +41,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, entityType = { IAMEntityType.Account })
@APICommand(name = "disableAccount", description = "Disables an account", responseObject = AccountResponse.class, entityType = {IAMEntityType.Account},
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";

3
api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
View File

@ -36,7 +36,8 @@ import org.apache.cloudstack.region.RegionService;
import com.cloud.user.Account;
@APICommand(name = "enableAccount", description = "Enables an account", responseObject = AccountResponse.class, entityType = { IAMEntityType.Account })
@APICommand(name = "enableAccount", description = "Enables an account", responseObject = AccountResponse.class, entityType = {IAMEntityType.Account},
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";

3
api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
View File

@ -28,7 +28,8 @@ import org.apache.cloudstack.api.response.DomainResponse;
import com.cloud.user.Account;
@APICommand(name = "lockAccount", description = "Locks an account", responseObject = AccountResponse.class, entityType = { IAMEntityType.Account })
@APICommand(name = "lockAccount", description = "Locks an account", responseObject = AccountResponse.class, entityType = {IAMEntityType.Account},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class LockAccountCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(LockAccountCmd.class.getName());

3
api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
View File

@ -39,7 +39,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, entityType = { IAMEntityType.Account })
@APICommand(name = "updateAccount", description = "Updates account information for the authenticated user", responseObject = AccountResponse.class, entityType = {IAMEntityType.Account},
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";

3
api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java
View File

@ -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";

3
api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
View File

@ -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";

3
api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
View File

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

4
api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
View File

@ -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";

4
api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
View File

@ -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";

3
api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
View File

@ -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";

3
api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
View File

@ -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";

3
api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
View File

@ -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";

3
api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
View File

@ -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";

3
api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
View File

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

4
api/src/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
View File

@ -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";

4
api/src/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
View File

@ -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";

5
api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
View File

@ -35,7 +35,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, entityType = { IAMEntityType.VirtualMachine })
@APICommand(name = "listInternalLoadBalancerVMs", description = "List internal LB VMs.", responseObject = DomainRouterResponse.class, entityType = {IAMEntityType.VirtualMachine},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListInternalLBVMsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListInternalLBVMsCmd.class.getName());
@ -134,6 +135,6 @@ public class ListInternalLBVMsCmd extends BaseListProjectAndAccountResourcesCmd
public void execute() {
ListResponse<DomainRouterResponse> response = _queryService.searchForInternalLbVms(this);
response.setResponseName(getCommandName());
this.setResponseObject(response);
setResponseObject(response);
}
}

4
api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
View File

@ -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";

5
api/src/org/apache/cloudstack/api/command/admin/internallb/StartInternalLBVMCmd.java
View File

@ -39,7 +39,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.", entityType = { IAMEntityType.VirtualMachine })
@APICommand(name = "startInternalLoadBalancerVM", responseObject = DomainRouterResponse.class, description = "Starts an existing internal lb vm.", entityType = {IAMEntityType.VirtualMachine},
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";
@ -116,7 +117,7 @@ public class StartInternalLBVMCmd extends BaseAsyncCmd {
if (result != null) {
DomainRouterResponse routerResponse = _responseGenerator.createDomainRouterResponse(result);
routerResponse.setResponseName(getCommandName());
this.setResponseObject(routerResponse);
setResponseObject(routerResponse);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to start internal lb vm");
}

5
api/src/org/apache/cloudstack/api/command/admin/internallb/StopInternalLBVMCmd.java
View File

@ -38,7 +38,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, entityType = { IAMEntityType.VirtualMachine })
@APICommand(name = "stopInternalLoadBalancerVM", description = "Stops an Internal LB vm.", responseObject = DomainRouterResponse.class, entityType = {IAMEntityType.VirtualMachine},
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";
@ -118,7 +119,7 @@ public class StopInternalLBVMCmd extends BaseAsyncCmd {
if (result != null) {
DomainRouterResponse response = _responseGenerator.createDomainRouterResponse(result);
response.setResponseName(getCommandName());
this.setResponseObject(response);
setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to stop internal lb vm");
}

3
api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
View File

@ -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";

4
api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
View File

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

3
api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
View File

@ -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";

3
api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
View File

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

4
api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
View File

@ -38,7 +38,9 @@ import com.cloud.user.Account;
@APICommand(name = "createStorageNetworkIpRange",
description = "Creates a Storage network IP range.",
responseObject = StorageNetworkIpRangeResponse.class,
since = "3.0.0")
since = "3.0.0",
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CreateStorageNetworkIpRangeCmd.class);

3
api/src/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
View File

@ -36,7 +36,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.GuestVlan;
import com.cloud.user.Account;
@APICommand(name = "dedicateGuestVlanRange", description = "Dedicates a guest vlan range to an account", responseObject = GuestVlanRangeResponse.class)
@APICommand(name = "dedicateGuestVlanRange", description = "Dedicates a guest vlan range to an account", responseObject = GuestVlanRangeResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DedicateGuestVlanRangeCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DedicateGuestVlanRangeCmd.class.getName());

3
api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
View File

@ -37,7 +37,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "deleteNetworkDevice", description = "Deletes network device.", responseObject = SuccessResponse.class)
@APICommand(name = "deleteNetworkDevice", description = "Deletes network device.", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkDeviceCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkDeviceCmd.class);
private static final String s_name = "deletenetworkdeviceresponse";

3
api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
View File

@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.user.Account;
@APICommand(name = "deleteNetworkOffering", description = "Deletes a network offering.", responseObject = SuccessResponse.class, since = "3.0.0")
@APICommand(name = "deleteNetworkOffering", description = "Deletes a network offering.", responseObject = SuccessResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkOfferingCmd.class.getName());
private static final String s_name = "deletenetworkofferingresponse";

3
api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
View File

@ -33,7 +33,8 @@ import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
@APICommand(name = "deleteNetworkServiceProvider", description = "Deletes a Network Service Provider.", responseObject = SuccessResponse.class, since = "3.0.0")
@APICommand(name = "deleteNetworkServiceProvider", description = "Deletes a Network Service Provider.", responseObject = SuccessResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkServiceProviderCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkServiceProviderCmd.class.getName());

3
api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
View File

@ -32,7 +32,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
@APICommand(name = "deletePhysicalNetwork", description = "Deletes a Physical Network.", responseObject = SuccessResponse.class, since = "3.0.0")
@APICommand(name = "deletePhysicalNetwork", description = "Deletes a Physical Network.", responseObject = SuccessResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeletePhysicalNetworkCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeletePhysicalNetworkCmd.class.getName());

3
api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
View File

@ -34,7 +34,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
@APICommand(name = "deleteStorageNetworkIpRange", description = "Deletes a storage network IP Range.", responseObject = SuccessResponse.class, since = "3.0.0")
@APICommand(name = "deleteStorageNetworkIpRange", description = "Deletes a storage network IP Range.", responseObject = SuccessResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteStorageNetworkIpRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteStorageNetworkIpRangeCmd.class);

3
api/src/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
View File

@ -36,7 +36,8 @@ import com.cloud.network.GuestVlan;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
@APICommand(name = "listDedicatedGuestVlanRanges", description = "Lists dedicated guest vlan ranges", responseObject = GuestVlanRangeResponse.class)
@APICommand(name = "listDedicatedGuestVlanRanges", description = "Lists dedicated guest vlan ranges", responseObject = GuestVlanRangeResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListDedicatedGuestVlanRangesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListDedicatedGuestVlanRangesCmd.class.getName());

3
api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java
View File

@ -42,7 +42,8 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.host.Host;
import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "listNetworkDevice", description = "List network devices", responseObject = NetworkDeviceResponse.class)
@APICommand(name = "listNetworkDevice", description = "List network devices", responseObject = NetworkDeviceResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListNetworkDeviceCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkDeviceCmd.class);
private static final String s_name = "listnetworkdevice";

4
api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
View File

@ -29,7 +29,9 @@ import com.cloud.network.Networks;
@APICommand(name = "listNetworkIsolationMethods",
description = "Lists supported methods of network isolation",
responseObject = IsolationMethodResponse.class,
since = "4.2.0")
since = "4.2.0",
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
public class ListNetworkIsolationMethodsCmd extends BaseListCmd {
private static final String s_name = "listnetworkisolationmethodsresponse";

4
api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
View File

@ -36,7 +36,9 @@ import com.cloud.utils.Pair;
@APICommand(name = "listNetworkServiceProviders",
description = "Lists network serviceproviders for a given physical network.",
responseObject = ProviderResponse.class,
since = "3.0.0")
since = "3.0.0",
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
public class ListNetworkServiceProvidersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkServiceProvidersCmd.class.getName());
private static final String Name = "listnetworkserviceprovidersresponse";

3
api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
View File

@ -35,7 +35,8 @@ import com.cloud.network.PhysicalNetwork;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
@APICommand(name = "listPhysicalNetworks", description = "Lists physical networks", responseObject = PhysicalNetworkResponse.class, since = "3.0.0")
@APICommand(name = "listPhysicalNetworks", description = "Lists physical networks", responseObject = PhysicalNetworkResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListPhysicalNetworksCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListPhysicalNetworksCmd.class.getName());

3
api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
View File

@ -39,7 +39,8 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
@APICommand(name = "listStorageNetworkIpRange", description = "List a storage network IP range.", responseObject = StorageNetworkIpRangeResponse.class, since = "3.0.0")
@APICommand(name = "listStorageNetworkIpRange", description = "List a storage network IP range.", responseObject = StorageNetworkIpRangeResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListStorageNetworkIpRangeCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListStorageNetworkIpRangeCmd.class);

4
api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
View File

@ -36,7 +36,9 @@ import com.cloud.user.Account;
@APICommand(name = "listSupportedNetworkServices",
description = "Lists all network services provided by CloudStack or for the given Provider.",
responseObject = ServiceResponse.class,
since = "3.0.0")
since = "3.0.0",
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
public class ListSupportedNetworkServicesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListSupportedNetworkServicesCmd.class.getName());
private static final String Name = "listsupportednetworkservicesresponse";

3
api/src/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
View File

@ -33,7 +33,8 @@ import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
import com.cloud.user.Account;
@APICommand(name = "releaseDedicatedGuestVlanRange", description = "Releases a dedicated guest vlan range to the system", responseObject = SuccessResponse.class)
@APICommand(name = "releaseDedicatedGuestVlanRange", description = "Releases a dedicated guest vlan range to the system", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReleaseDedicatedGuestVlanRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedGuestVlanRangeCmd.class.getName());
private static final String s_name = "releasededicatedguestvlanrangeresponse";

3
api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
View File

@ -29,7 +29,8 @@ import org.apache.cloudstack.api.response.NetworkOfferingResponse;
import com.cloud.offering.NetworkOffering;
import com.cloud.user.Account;
@APICommand(name = "updateNetworkOffering", description = "Updates a network offering.", responseObject = NetworkOfferingResponse.class)
@APICommand(name = "updateNetworkOffering", description = "Updates a network offering.", responseObject = NetworkOfferingResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateNetworkOfferingCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkOfferingCmd.class.getName());
private static final String Name = "updatenetworkofferingresponse";

4
api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
View File

@ -36,7 +36,9 @@ import com.cloud.user.Account;
@APICommand(name = "updateNetworkServiceProvider",
description = "Updates a network serviceProvider of a physical network",
responseObject = ProviderResponse.class,
since = "3.0.0")
since = "3.0.0",
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
public class UpdateNetworkServiceProviderCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkServiceProviderCmd.class.getName());

Some files were not shown because too many files have changed in this diff Show More