You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/05/21 17:49:41 UTC
[01/10] git commit: updated refs/heads/master to 84266b1
Repository: cloudstack
Updated Branches:
refs/heads/master 59388b09a -> 84266b1c7
fix typos balacner -> balancer
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5cd35a22
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5cd35a22
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5cd35a22
Branch: refs/heads/master
Commit: 5cd35a2237d4402c0e3520db08c6d42a10595c29
Parents: 23a44d6
Author: Rene Moser <re...@apache.org>
Authored: Wed May 20 21:29:51 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:17 2015 +0200
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/BaseAsyncCmd.java | 2 +-
.../user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java | 2 +-
.../user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cd35a22/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
index e1b4d70..8963415 100644
--- a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java
@@ -28,7 +28,7 @@ public abstract class BaseAsyncCmd extends BaseCmd {
public static final String networkSyncObject = "network";
public static final String vpcSyncObject = "vpc";
public static final String snapshotHostSyncObject = "snapshothost";
- public static final String gslbSyncObject = "globalserverloadbalacner";
+ public static final String gslbSyncObject = "globalserverloadbalancer";
private static final Logger s_logger = Logger.getLogger(BaseAsyncCmd.class.getName());
private Object job;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cd35a22/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
index 8e1b4dd..99971bf 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java
@@ -73,7 +73,7 @@ public class AssignToGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
collectionType = CommandType.UUID,
entityType = FirewallRuleResponse.class,
required = true,
- description = "the list load balancer rules that " + "will be assigned to gloabal load balacner rule")
+ description = "the list load balancer rules that will be assigned to global load balancer rule")
private List<Long> loadBalancerRulesIds;
@Parameter(name = ApiConstants.GSLB_LBRULE_WEIGHT_MAP,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cd35a22/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
index af3fa34..c514984 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java
@@ -42,7 +42,7 @@ import com.cloud.user.Account;
import com.cloud.utils.StringUtils;
@APICommand(name = "removeFromGlobalLoadBalancerRule",
- description = "Removes a load balancer rule association with" + " global load balancer rule",
+ description = "Removes a load balancer rule association with global load balancer rule",
responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
@@ -67,7 +67,7 @@ public class RemoveFromGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
collectionType = CommandType.UUID,
entityType = FirewallRuleResponse.class,
required = true,
- description = "the list load balancer rules that " + "will be assigned to gloabal load balacner rule")
+ description = "the list load balancer rules that will be assigned to gloabal load balancer rule")
private List<Long> loadBalancerRulesIds;
/////////////////////////////////////////////////////
[06/10] git commit: updated refs/heads/master to 84266b1
Posted by da...@apache.org.
api: address: fix and reformat descriptions
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c65acff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c65acff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c65acff
Branch: refs/heads/master
Commit: 4c65acfff7bfd5633a7adfaf062603ddea4742df
Parents: 68e867f
Author: Rene Moser <re...@apache.org>
Authored: Thu May 21 09:37:27 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:18 2015 +0200
----------------------------------------------------------------------
.../user/address/AssociateIPAddrCmd.java | 30 ++++++++++----------
.../user/address/DisassociateIPAddrCmd.java | 14 ++++-----
.../user/address/ListPublicIpAddressesCmd.java | 16 +++++------
.../command/user/address/UpdateIPAddrCmd.java | 12 ++++----
4 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c65acff/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
index 63939dc..75bd9d2 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
@@ -85,13 +85,13 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.NETWORK_ID,
type = CommandType.UUID,
entityType = NetworkResponse.class,
- description = "The network this ip address should be associated to.")
+ description = "The network this IP address should be associated to.")
private Long networkId;
- @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Deploy vm for the project")
+ @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Deploy VM for the project")
private Long projectId;
- @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "the VPC you want the ip address to "
+ @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "the VPC you want the IP address to "
+ "be associated with")
private Long vpcId;
@@ -103,10 +103,10 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
type = CommandType.INTEGER,
entityType = RegionResponse.class,
required = false,
- description = "region ID from where portable ip is to be associated.")
+ description = "region ID from where portable IP is to be associated.")
private Integer regionId;
- @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the ip to the end user or not", since = "4.4", authorized = {RoleType.Admin})
+ @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the IP to the end user or not", since = "4.4", authorized = {RoleType.Admin})
private Boolean display;
/////////////////////////////////////////////////////
@@ -142,7 +142,7 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
}
}
- throw new InvalidParameterValueException("Unable to figure out zone to assign ip to."
+ throw new InvalidParameterValueException("Unable to figure out zone to assign IP to."
+ " Please specify either zoneId, or networkId, or vpcId in the call");
}
@@ -182,16 +182,16 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
}
if (networks.size() < 1) {
- throw new InvalidParameterValueException("Account doesn't have any Isolated networks in the zone");
+ throw new InvalidParameterValueException("Account doesn't have any isolated networks in the zone");
} else if (networks.size() > 1) {
- throw new InvalidParameterValueException("Account has more than one Isolated network in the zone");
+ throw new InvalidParameterValueException("Account has more than one isolated network in the zone");
}
return networks.get(0).getId();
} else {
Network defaultGuestNetwork = _networkService.getExclusiveGuestNetwork(zoneId);
if (defaultGuestNetwork == null) {
- throw new InvalidParameterValueException("Unable to find a default Guest network for account " + getAccountName() + " in domain id=" + getDomainId());
+ throw new InvalidParameterValueException("Unable to find a default guest network for account " + getAccountName() + " in domain ID=" + getDomainId());
} else {
return defaultGuestNetwork.getId();
}
@@ -227,7 +227,7 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
" as it's no longer active");
}
} else {
- throw new InvalidParameterValueException("Unable to find project by id");
+ throw new InvalidParameterValueException("Unable to find project by ID");
}
} else if (networkId != null) {
Network network = _networkService.getNetwork(networkId);
@@ -249,7 +249,7 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
} else if (vpcId != null) {
Vpc vpc = _entityMgr.findById(Vpc.class, getVpcId());
if (vpc == null) {
- throw new InvalidParameterValueException("Can't find Enabled vpc by id specified");
+ throw new InvalidParameterValueException("Can't find enabled VPC by ID specified");
}
return vpc.getAccountId();
}
@@ -268,7 +268,7 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
@Override
public String getEventDescription() {
- return "associating ip to network id: " + getNetworkId() + " in zone " + getZoneId();
+ return "associating IP to network ID: " + getNetworkId() + " in zone " + getZoneId();
}
/////////////////////////////////////////////////////
@@ -299,7 +299,7 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
setEntityId(ip.getId());
setEntityUuid(ip.getUuid());
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to allocate ip address");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to allocate IP address");
}
} catch (ConcurrentOperationException ex) {
s_logger.warn("Exception: ", ex);
@@ -313,7 +313,7 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
@Override
public void execute() throws ResourceUnavailableException, ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException {
- CallContext.current().setEventDetails("Ip Id: " + getEntityId());
+ CallContext.current().setEventDetails("IP ID: " + getEntityId());
IpAddress result = null;
@@ -328,7 +328,7 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
ipResponse.setResponseName(getCommandName());
setResponseObject(ipResponse);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to assign ip address");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to assign IP address");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c65acff/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
index ba41844..c2e173c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
@@ -36,7 +36,7 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.IpAddress;
import com.cloud.user.Account;
-@APICommand(name = "disassociateIpAddress", description = "Disassociates an ip address from the account.", responseObject = SuccessResponse.class,
+@APICommand(name = "disassociateIpAddress", description = "Disassociates an IP address from the account.", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, entityType = { IpAddress.class })
public class DisassociateIPAddrCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DisassociateIPAddrCmd.class.getName());
@@ -47,7 +47,7 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = IPAddressResponse.class, required = true, description = "the id of the public ip address"
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = IPAddressResponse.class, required = true, description = "the ID of the public IP address"
+ " to disassociate")
private Long id;
@@ -74,7 +74,7 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd {
@Override
public void execute() throws InsufficientAddressCapacityException {
- CallContext.current().setEventDetails("Ip Id: " + getIpAddressId());
+ CallContext.current().setEventDetails("IP ID: " + getIpAddressId());
boolean result = false;
if (!isPortable(id)) {
result = _networkService.releaseIpAddress(getIpAddressId());
@@ -85,7 +85,7 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to disassociate ip address");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to disassociate IP address");
}
}
@@ -100,7 +100,7 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return ("Disassociating ip address with id=" + id);
+ return ("Disassociating IP address with ID=" + id);
}
@Override
@@ -108,7 +108,7 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd {
if (ownerId == null) {
IpAddress ip = getIpAddress(id);
if (ip == null) {
- throw new InvalidParameterValueException("Unable to find ip address by id=" + id);
+ throw new InvalidParameterValueException("Unable to find IP address by ID=" + id);
}
ownerId = ip.getAccountId();
}
@@ -134,7 +134,7 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd {
IpAddress ip = _entityMgr.findById(IpAddress.class, id);
if (ip == null) {
- throw new InvalidParameterValueException("Unable to find ip address by id=" + id);
+ throw new InvalidParameterValueException("Unable to find IP address by ID=" + id);
} else {
return ip;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c65acff/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
index 5720a50..0a0e7a1 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
@@ -39,7 +39,7 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.network.IpAddress;
import com.cloud.utils.Pair;
-@APICommand(name = "listPublicIpAddresses", description = "Lists all public ip addresses", responseObject = IPAddressResponse.class, responseView = ResponseView.Restricted,
+@APICommand(name = "listPublicIpAddresses", description = "Lists all public IP addresses", responseObject = IPAddressResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, entityType = { IpAddress.class })
public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListPublicIpAddressesCmd.class.getName());
@@ -59,7 +59,7 @@ public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.FOR_VIRTUAL_NETWORK, type = CommandType.BOOLEAN, description = "the virtual network for the IP address")
private Boolean forVirtualNetwork;
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = IPAddressResponse.class, description = "lists ip address by id")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = IPAddressResponse.class, description = "lists IP address by ID")
private Long id;
@Parameter(name = ApiConstants.IP_ADDRESS, type = CommandType.STRING, description = "lists the specified IP address")
@@ -68,16 +68,16 @@ public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.VLAN_ID, type = CommandType.UUID, entityType = VlanIpRangeResponse.class, description = "lists all public IP addresses by VLAN ID")
private Long vlanId;
- @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "lists all public IP addresses by Zone ID")
+ @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "lists all public IP addresses by zone ID")
private Long zoneId;
- @Parameter(name = ApiConstants.FOR_LOAD_BALANCING, type = CommandType.BOOLEAN, description = "list only ips used for load balancing")
+ @Parameter(name = ApiConstants.FOR_LOAD_BALANCING, type = CommandType.BOOLEAN, description = "list only IPs used for load balancing")
private Boolean forLoadBalancing;
@Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID,
type = CommandType.UUID,
entityType = PhysicalNetworkResponse.class,
- description = "lists all public IP addresses by physical network id")
+ description = "lists all public IP addresses by physical network ID")
private Long physicalNetworkId;
@Parameter(name = ApiConstants.ASSOCIATED_NETWORK_ID,
@@ -86,13 +86,13 @@ public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd {
description = "lists all public IP addresses associated to the network specified")
private Long associatedNetworkId;
- @Parameter(name = ApiConstants.IS_SOURCE_NAT, type = CommandType.BOOLEAN, description = "list only source nat ip addresses")
+ @Parameter(name = ApiConstants.IS_SOURCE_NAT, type = CommandType.BOOLEAN, description = "list only source NAT IP addresses")
private Boolean isSourceNat;
- @Parameter(name = ApiConstants.IS_STATIC_NAT, type = CommandType.BOOLEAN, description = "list only static nat ip addresses")
+ @Parameter(name = ApiConstants.IS_STATIC_NAT, type = CommandType.BOOLEAN, description = "list only static NAT IP addresses")
private Boolean isStaticNat;
- @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "List ips belonging to the VPC")
+ @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "List IPs belonging to the VPC")
private Long vpcId;
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "list resources by display flag; only ROOT admin is eligible to pass this parameter", since = "4.4", authorized = {RoleType.Admin})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c65acff/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
index f0ea667..6d20283 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
@@ -38,7 +38,7 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.IpAddress;
import com.cloud.user.Account;
-@APICommand(name = "updateIpAddress", description = "Updates an ip address", responseObject = IPAddressResponse.class,
+@APICommand(name = "updateIpAddress", description = "Updates an IP address", responseObject = IPAddressResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, entityType = { IpAddress.class })
public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateIPAddrCmd.class.getName());
@@ -48,14 +48,14 @@ public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = IPAddressResponse.class, required = true, description = "the id of the public ip address"
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = IPAddressResponse.class, required = true, description = "the ID of the public IP address"
+ " to update")
private Long id;
// unexposed parameter needed for events logging
@Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, expose = false)
private Long ownerId;
- @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the ip to the end user or not", since = "4.4", authorized = {RoleType.Admin})
+ @Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the IP to the end user or not", since = "4.4", authorized = {RoleType.Admin})
private Boolean display;
/////////////////////////////////////////////////////
@@ -85,7 +85,7 @@ public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd {
@Override
public String getEventDescription() {
- return ("Updating ip address with id=" + id);
+ return ("Updating IP address with ID=" + id);
}
@@ -94,7 +94,7 @@ public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd {
if (ownerId == null) {
IpAddress ip = getIpAddress(id);
if (ip == null) {
- throw new InvalidParameterValueException("Unable to find ip address by id=" + id);
+ throw new InvalidParameterValueException("Unable to find IP address by ID=" + id);
}
ownerId = ip.getAccountId();
}
@@ -109,7 +109,7 @@ public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd {
IpAddress ip = _entityMgr.findById(IpAddress.class, id);
if (ip == null) {
- throw new InvalidParameterValueException("Unable to find ip address by id=" + id);
+ throw new InvalidParameterValueException("Unable to find IP address by ID=" + id);
} else {
return ip;
}
[07/10] git commit: updated refs/heads/master to 84266b1
Posted by da...@apache.org.
api: affinitygroup: fix and reformat descriptions
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f17ab71b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f17ab71b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f17ab71b
Branch: refs/heads/master
Commit: f17ab71bdf299a42d16a3ee55508e8c1b0e30c6c
Parents: 4c65acf
Author: Rene Moser <re...@apache.org>
Authored: Thu May 21 09:38:12 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:18 2015 +0200
----------------------------------------------------------------------
.../api/command/user/affinitygroup/DeleteAffinityGroupCmd.java | 6 +++---
.../api/command/user/affinitygroup/ListAffinityGroupsCmd.java | 4 ++--
.../command/user/affinitygroup/UpdateVMAffinityGroupCmd.java | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f17ab71b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
index 21c2fa8..4eeff06 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
@@ -64,7 +64,7 @@ public class DeleteAffinityGroupCmd extends BaseAsyncCmd {
entityType = AffinityGroupResponse.class)
private Long id;
- @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "The name of the affinity group. Mutually exclusive with id parameter")
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "The name of the affinity group. Mutually exclusive with ID parameter")
private String name;
/////////////////////////////////////////////////////
@@ -87,12 +87,12 @@ public class DeleteAffinityGroupCmd extends BaseAsyncCmd {
if (name != null) {
id = _responseGenerator.getAffinityGroupId(name, getEntityOwnerId());
if (id == null) {
- throw new InvalidParameterValueException("Unable to find affinity group by name " + name + " for the account id=" + getEntityOwnerId());
+ throw new InvalidParameterValueException("Unable to find affinity group by name " + name + " for the account ID=" + getEntityOwnerId());
}
}
if (id == null) {
- throw new InvalidParameterValueException("Either id or name parameter is requred by deleteAffinityGroup command");
+ throw new InvalidParameterValueException("Either ID or name parameter is required by deleteAffinityGroup command");
}
return id;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f17ab71b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
index 6313c48..41ed6fb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
@@ -44,11 +44,11 @@ public class ListAffinityGroupsCmd extends BaseListAccountResourcesCmd {
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
type = CommandType.UUID,
- description = "lists affinity groups by virtual machine id",
+ description = "lists affinity groups by virtual machine ID",
entityType = UserVmResponse.class)
private Long virtualMachineId;
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, description = "list the affinity group by the id provided", entityType = AffinityGroupResponse.class)
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, description = "list the affinity group by the ID provided", entityType = AffinityGroupResponse.class)
private Long id;
@Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "lists affinity groups by type")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f17ab71b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
index 6620147..703b051 100644
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
@@ -138,7 +138,7 @@ public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException {
- CallContext.current().setEventDetails("Vm Id: " + getId());
+ CallContext.current().setEventDetails("VM ID: " + getId());
UserVm result = _affinityGroupService.updateVMAffinityGroups(getId(), getAffinityGroupIdList());
ArrayList<VMDetails> dc = new ArrayList<VMDetails>();
dc.add(VMDetails.valueOf("affgrp"));
@@ -149,7 +149,7 @@ public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd {
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update vm's affinity groups");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update VM's affinity groups");
}
}
@@ -160,7 +160,7 @@ public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return "updating VM Affinity Group";
+ return "updating VM affinity group";
}
@Override
[09/10] git commit: updated refs/heads/master to 84266b1
Posted by da...@apache.org.
api: firewall: fix and reformat descriptions
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/897c7386
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/897c7386
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/897c7386
Branch: refs/heads/master
Commit: 897c73867d85fdc4b41c2d303ed422e34d2a9eb9
Parents: f17ab71
Author: Rene Moser <re...@apache.org>
Authored: Thu May 21 09:52:53 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:18 2015 +0200
----------------------------------------------------------------------
.../firewall/CreateEgressFirewallRuleCmd.java | 2 +-
.../user/firewall/CreateFirewallRuleCmd.java | 20 ++++++++++----------
.../firewall/CreatePortForwardingRuleCmd.java | 2 +-
.../firewall/DeleteEgressFirewallRuleCmd.java | 2 +-
.../user/firewall/DeleteFirewallRuleCmd.java | 4 ++--
.../firewall/DeletePortForwardingRuleCmd.java | 6 +++---
.../firewall/ListEgressFirewallRulesCmd.java | 6 +++---
.../user/firewall/ListFirewallRulesCmd.java | 2 +-
.../firewall/ListPortForwardingRulesCmd.java | 2 +-
.../firewall/UpdateEgressFirewallRuleCmd.java | 2 +-
.../user/firewall/UpdateFirewallRuleCmd.java | 4 ++--
.../firewall/UpdatePortForwardingRuleCmd.java | 2 +-
12 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
index b130370..0303445 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
@@ -247,7 +247,7 @@ public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements F
}
if (getProtocol().equalsIgnoreCase(NetUtils.ALL_PROTO)) {
if (getSourcePortStart() != null && getSourcePortEnd() != null) {
- throw new InvalidParameterValueException("Do not pass ports to protocol ALL, porotocol ALL do not require ports. Unable to create " +
+ throw new InvalidParameterValueException("Do not pass ports to protocol ALL, protocol ALL do not require ports. Unable to create " +
"firewall rule for the network id=" + networkId);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
index 7595d36..ee62aa5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
@@ -43,7 +43,7 @@ import com.cloud.network.rules.FirewallRule;
import com.cloud.user.Account;
import com.cloud.utils.net.NetUtils;
-@APICommand(name = "createFirewallRule", description = "Creates a firewall rule for a given ip address", responseObject = FirewallResponse.class, entityType = {FirewallRule.class},
+@APICommand(name = "createFirewallRule", description = "Creates a firewall rule for a given IP address", responseObject = FirewallResponse.class, entityType = {FirewallRule.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements FirewallRule {
public static final Logger s_logger = Logger.getLogger(CreateFirewallRuleCmd.class.getName());
@@ -73,10 +73,10 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
@Parameter(name = ApiConstants.END_PORT, type = CommandType.INTEGER, description = "the ending port of firewall rule")
private Integer publicEndPort;
- @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the cidr list to forward traffic from")
+ @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the CIDR list to forward traffic from")
private List<String> cidrlist;
- @Parameter(name = ApiConstants.ICMP_TYPE, type = CommandType.INTEGER, description = "type of the icmp message being sent")
+ @Parameter(name = ApiConstants.ICMP_TYPE, type = CommandType.INTEGER, description = "type of the ICMP message being sent")
private Integer icmpType;
@Parameter(name = ApiConstants.ICMP_CODE, type = CommandType.INTEGER, description = "error code for this icmp message")
@@ -133,7 +133,7 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
boolean success = false;
FirewallRule rule = _entityMgr.findById(FirewallRule.class, getEntityId());
try {
- CallContext.current().setEventDetails("Rule Id: " + getEntityId());
+ CallContext.current().setEventDetails("Rule ID: " + getEntityId());
success = _firewallService.applyIngressFwRules(rule.getSourceIpAddressId(), callerContext.getCallingAccount());
// State is different after the rule is applied, so get new object here
@@ -154,7 +154,7 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
@Override
public long getId() {
- throw new UnsupportedOperationException("database id can only provided by VO objects");
+ throw new UnsupportedOperationException("database ID can only provided by VO objects");
}
@Override
@@ -215,8 +215,8 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
}
if (ntwkId == null) {
- throw new InvalidParameterValueException("Unable to create firewall rule for the ipAddress id=" + ipAddressId +
- " as ip is not associated with any network and no networkId is passed in");
+ throw new InvalidParameterValueException("Unable to create firewall rule for the IP address ID=" + ipAddressId +
+ " as IP is not associated with any network and no networkId is passed in");
}
return ntwkId;
}
@@ -243,7 +243,7 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
if (getSourceCidrList() != null) {
for (String cidr : getSourceCidrList()) {
if (!NetUtils.isValidCIDR(cidr)) {
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Source cidrs formatting error " + cidr);
+ throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Source CIDRs formatting error " + cidr);
}
}
}
@@ -268,7 +268,7 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
@Override
public String getEventDescription() {
IpAddress ip = _networkService.getIp(ipAddressId);
- return ("Creating firewall rule for Ip: " + ip.getAddress() + " for protocol:" + getProtocol());
+ return ("Creating firewall rule for IP: " + ip.getAddress() + " for protocol:" + getProtocol());
}
@Override
@@ -290,7 +290,7 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
private IpAddress getIp() {
IpAddress ip = _networkService.getIp(ipAddressId);
if (ip == null) {
- throw new InvalidParameterValueException("Unable to find ip address by id " + ipAddressId);
+ throw new InvalidParameterValueException("Unable to find IP address by ID " + ipAddressId);
}
return ip;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
index 122cad0..9a0dffe 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
@@ -79,7 +79,7 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
@Parameter(name = ApiConstants.PROTOCOL,
type = CommandType.STRING,
required = true,
- description = "the protocol for the port fowarding rule. Valid values are TCP or UDP.")
+ description = "the protocol for the port forwarding rule. Valid values are TCP or UDP.")
private String protocol;
@Parameter(name = ApiConstants.PRIVATE_END_PORT,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
index d08169d..59a0519 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
@@ -38,7 +38,7 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.FirewallRule;
-@APICommand(name = "deleteEgressFirewallRule", description = "Deletes an ggress firewall rule", responseObject = SuccessResponse.class, entityType = {FirewallRule.class},
+@APICommand(name = "deleteEgressFirewallRule", description = "Deletes an egress firewall rule", responseObject = SuccessResponse.class, entityType = {FirewallRule.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteEgressFirewallRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteEgressFirewallRuleCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
index 0f10012..ba8b18e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
@@ -77,7 +77,7 @@ public class DeleteFirewallRuleCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return ("Deleting firewall rule id=" + id);
+ return ("Deleting firewall rule ID=" + id);
}
@Override
@@ -85,7 +85,7 @@ public class DeleteFirewallRuleCmd extends BaseAsyncCmd {
if (ownerId == null) {
FirewallRule rule = _entityMgr.findById(FirewallRule.class, id);
if (rule == null) {
- throw new InvalidParameterValueException("Unable to find firewall rule by id=" + id);
+ throw new InvalidParameterValueException("Unable to find firewall rule by ID=" + id);
} else {
ownerId = _entityMgr.findById(FirewallRule.class, id).getAccountId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
index 4c7b07f..1c45280 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
@@ -81,7 +81,7 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return ("Deleting port forwarding rule for id=" + id);
+ return ("Deleting port forwarding rule for ID=" + id);
}
@Override
@@ -89,7 +89,7 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
if (ownerId == null) {
PortForwardingRule rule = _entityMgr.findById(PortForwardingRule.class, id);
if (rule == null) {
- throw new InvalidParameterValueException("Unable to find port forwarding rule by id=" + id);
+ throw new InvalidParameterValueException("Unable to find port forwarding rule by ID=" + id);
} else {
ownerId = _entityMgr.findById(PortForwardingRule.class, id).getAccountId();
}
@@ -100,7 +100,7 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
@Override
public void execute() {
- CallContext.current().setEventDetails("Rule Id: " + id);
+ CallContext.current().setEventDetails("Rule ID: " + id);
//revoke corresponding firewall rule first
boolean result = _firewallService.revokeRelatedFirewallRule(id, true);
result = result && _rulesService.revokePortForwardingRule(id, true);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
index c56e133..3664031 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
@@ -36,7 +36,7 @@ import org.apache.cloudstack.api.response.NetworkResponse;
import com.cloud.network.rules.FirewallRule;
import com.cloud.utils.Pair;
-@APICommand(name = "listEgressFirewallRules", description = "Lists all egress firewall rules for network id.", responseObject = FirewallResponse.class, entityType = {FirewallRule.class},
+@APICommand(name = "listEgressFirewallRules", description = "Lists all egress firewall rules for network ID.", responseObject = FirewallResponse.class, entityType = {FirewallRule.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListEgressFirewallRulesCmd extends BaseListTaggedResourcesCmd implements IListFirewallRulesCmd {
public static final Logger s_logger = Logger.getLogger(ListEgressFirewallRulesCmd.class.getName());
@@ -51,13 +51,13 @@ public class ListEgressFirewallRulesCmd extends BaseListTaggedResourcesCmd imple
@Parameter(name = ApiConstants.NETWORK_ID,
type = CommandType.UUID,
entityType = NetworkResponse.class,
- description = "the network id for the egress firewall services")
+ description = "the network ID for the egress firewall services")
private Long networkId;
@Parameter(name = ApiConstants.IP_ADDRESS_ID,
type = CommandType.UUID,
entityType = IPAddressResponse.class,
- description = "the id of IP address of the firewall services")
+ description = "the ID of IP address of the firewall services")
private Long ipAddressId;
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "list resources by display flag; only ROOT admin is eligible to pass this parameter", since = "4.4", authorized = {RoleType.Admin})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
index 9ace5bd..3c3feea 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
@@ -50,7 +50,7 @@ public class ListFirewallRulesCmd extends BaseListTaggedResourcesCmd implements
@Parameter(name = ApiConstants.IP_ADDRESS_ID,
type = CommandType.UUID,
entityType = IPAddressResponse.class,
- description = "the id of IP address of the firewall services")
+ description = "the ID of IP address of the firewall services")
private Long ipAddressId;
@Parameter(name = ApiConstants.NETWORK_ID,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
index 5d44815..d5c49a9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
@@ -51,7 +51,7 @@ public class ListPortForwardingRulesCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.IP_ADDRESS_ID,
type = CommandType.UUID,
entityType = IPAddressResponse.class,
- description = "the id of IP address of the port forwarding services")
+ description = "the ID of IP address of the port forwarding services")
private Long ipAddressId;
@Parameter(name = ApiConstants.NETWORK_ID,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
index b597a89..ddaaf71 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
@@ -112,7 +112,7 @@ public class UpdateEgressFirewallRuleCmd extends BaseAsyncCustomIdCmd {
if (ownerId == null) {
FirewallRule rule = _entityMgr.findById(FirewallRule.class, id);
if (rule == null || rule.getTrafficType() != TrafficType.Egress) {
- throw new InvalidParameterValueException("Unable to find egress firewall rule by id");
+ throw new InvalidParameterValueException("Unable to find egress firewall rule by ID");
} else {
ownerId = _entityMgr.findById(FirewallRule.class, id).getAccountId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
index e9c87d0..3d11ed0 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
@@ -78,7 +78,7 @@ public class UpdateFirewallRuleCmd extends BaseAsyncCustomIdCmd {
@Override
public void execute() throws ResourceUnavailableException {
- CallContext.current().setEventDetails("Rule Id: " + id);
+ CallContext.current().setEventDetails("Rule ID: " + id);
FirewallRule rule = _firewallService.updateIngressFirewallRule(id, this.getCustomId(), getDisplay());
FirewallResponse fwResponse = new FirewallResponse();
@@ -113,7 +113,7 @@ public class UpdateFirewallRuleCmd extends BaseAsyncCustomIdCmd {
if (ownerId == null) {
FirewallRule rule = _entityMgr.findById(FirewallRule.class, id);
if (rule == null || rule.getTrafficType() != TrafficType.Ingress) {
- throw new InvalidParameterValueException("Unable to find firewall rule by id");
+ throw new InvalidParameterValueException("Unable to find firewall rule by ID");
} else {
ownerId = _entityMgr.findById(FirewallRule.class, id).getAccountId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897c7386/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
index 596b1d2..5f609b7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
@@ -35,7 +35,7 @@ import com.cloud.utils.net.Ip;
@APICommand(name = "updatePortForwardingRule",
responseObject = FirewallRuleResponse.class,
- description = "Updates a port forwarding rule. Only the private port and the virtual machine can be updated.", entityType = {PortForwardingRule.class},
+ description = "Updates a port forwarding rule. Only the private port and the virtual machine can be updated.", entityType = {PortForwardingRule.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdatePortForwardingRuleCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdatePortForwardingRuleCmd.class.getName());
[02/10] git commit: updated refs/heads/master to 84266b1
Posted by da...@apache.org.
instanceGroupResponse: fix description
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23a44d64
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23a44d64
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23a44d64
Branch: refs/heads/master
Commit: 23a44d6417fc1eca6e61d64a79ef4e1d01928b30
Parents: 3824d99
Author: Rene Moser <re...@apache.org>
Authored: Wed May 20 21:13:12 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:17 2015 +0200
----------------------------------------------------------------------
.../apache/cloudstack/api/response/InstanceGroupResponse.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23a44d64/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
index a2baf99..39f4b2f 100644
--- a/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java
@@ -30,8 +30,9 @@ import com.cloud.vm.InstanceGroup;
@SuppressWarnings("unused")
@EntityReference(value = InstanceGroup.class)
public class InstanceGroupResponse extends BaseResponse implements ControlledViewEntityResponse {
+
@SerializedName(ApiConstants.ID)
- @Param(description = "the id of the instance group")
+ @Param(description = "the ID of the instance group")
private String id;
@SerializedName(ApiConstants.NAME)
@@ -47,11 +48,11 @@ public class InstanceGroupResponse extends BaseResponse implements ControlledVie
private String accountName;
@SerializedName(ApiConstants.PROJECT_ID)
- @Param(description = "the project id of the group")
+ @Param(description = "the project ID of the instance group")
private String projectId;
@SerializedName(ApiConstants.PROJECT)
- @Param(description = "the project name of the group")
+ @Param(description = "the project name of the instance group")
private String projectName;
@SerializedName(ApiConstants.DOMAIN_ID)
[08/10] git commit: updated refs/heads/master to 84266b1
Posted by da...@apache.org.
api: loadbalancer: fix and reformat descriptions
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c1fbb782
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c1fbb782
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c1fbb782
Branch: refs/heads/master
Commit: c1fbb7821afb3e93cca8558f2d1d7590557b9ade
Parents: a1f58c4
Author: Rene Moser <re...@apache.org>
Authored: Thu May 21 10:14:33 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:18 2015 +0200
----------------------------------------------------------------------
.../AssignCertToLoadBalancerCmd.java | 6 ++---
.../CreateApplicationLoadBalancerCmd.java | 18 +++++++--------
.../CreateLBHealthCheckPolicyCmd.java | 12 +++++-----
.../CreateLBStickinessPolicyCmd.java | 12 +++++-----
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 24 ++++++++++----------
.../DeleteApplicationLoadBalancerCmd.java | 2 +-
.../DeleteLBHealthCheckPolicyCmd.java | 14 ++++++------
.../DeleteLBStickinessPolicyCmd.java | 4 ++--
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 2 +-
.../user/loadbalancer/DeleteSslCertCmd.java | 2 +-
.../ListApplicationLoadBalancersCmd.java | 16 ++++++-------
.../ListLBHealthCheckPoliciesCmd.java | 6 ++---
.../ListLBStickinessPoliciesCmd.java | 8 +++----
.../ListLoadBalancerRuleInstancesCmd.java | 2 +-
.../loadbalancer/ListLoadBalancerRulesCmd.java | 4 ++--
.../user/loadbalancer/ListSslCertsCmd.java | 10 ++++----
.../RemoveCertFromLoadBalancerCmd.java | 4 ++--
.../UpdateApplicationLoadBalancerCmd.java | 8 +++----
.../UpdateLBHealthCheckPolicyCmd.java | 6 ++---
.../UpdateLBStickinessPolicyCmd.java | 4 ++--
.../loadbalancer/UpdateLoadBalancerRuleCmd.java | 6 ++---
.../user/loadbalancer/UploadSslCertCmd.java | 10 ++++----
22 files changed, 90 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
index ddafa72..6638151 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
@@ -38,7 +38,7 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
-@APICommand(name = "assignCertToLoadBalancer", description = "Assigns a certificate to a Load Balancer Rule", responseObject = SuccessResponse.class,
+@APICommand(name = "assignCertToLoadBalancer", description = "Assigns a certificate to a load balancer rule", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd {
@@ -68,7 +68,7 @@ public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to assign certificate to loadbalancer");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to assign certificate to load balancer");
}
}
@@ -84,7 +84,7 @@ public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return "Assigining a certificate to a loadbalancer";
+ return "Assigning a certificate to a load balancer";
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
index 2257180..4e31c6a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
@@ -41,7 +41,7 @@ import com.cloud.network.Network;
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
import com.cloud.utils.net.NetUtils;
-@APICommand(name = "createLoadBalancer", description = "Creates a Load Balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
+@APICommand(name = "createLoadBalancer", description = "Creates a load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateApplicationLoadBalancerCmd.class.getName());
@@ -51,17 +51,17 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "name of the Load Balancer")
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "name of the load balancer")
private String loadBalancerName;
- @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "the description of the Load Balancer", length = 4096)
+ @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "the description of the load balancer", length = 4096)
private String description;
@Parameter(name = ApiConstants.NETWORK_ID,
type = CommandType.UUID,
required = true,
entityType = NetworkResponse.class,
- description = "The guest network the Load Balancer will be created for")
+ description = "The guest network the load balancer will be created for")
private Long networkId;
@Parameter(name = ApiConstants.SOURCE_PORT,
@@ -79,7 +79,7 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
description = "the TCP port of the virtual machine where the network traffic will be load balanced to")
private Integer instancePort;
- @Parameter(name = ApiConstants.SOURCE_IP, type = CommandType.STRING, description = "the source ip address the network traffic will be load balanced from")
+ @Parameter(name = ApiConstants.SOURCE_IP, type = CommandType.STRING, description = "the source IP address the network traffic will be load balanced from")
private String sourceIp;
@Parameter(name = ApiConstants.SOURCE_IP_NETWORK_ID,
@@ -141,7 +141,7 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
//get account info from the network object
Network ntwk = _networkService.getNetwork(networkId);
if (ntwk == null) {
- throw new InvalidParameterValueException("Invalid network id specified");
+ throw new InvalidParameterValueException("Invalid network ID specified");
}
return ntwk.getAccountId();
@@ -180,7 +180,7 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
if (scheme.equalsIgnoreCase(Scheme.Internal.toString())) {
return Scheme.Internal;
} else {
- throw new InvalidParameterValueException("Invalid value for scheme. Supported value is Internal");
+ throw new InvalidParameterValueException("Invalid value for scheme. Supported value is internal");
}
}
@@ -208,10 +208,10 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
setResponseObject(lbResponse);
lbResponse.setResponseName(getCommandName());
} catch (Exception ex) {
- s_logger.warn("Failed to create Load Balancer due to exception ", ex);
+ s_logger.warn("Failed to create load balancer due to exception ", ex);
} finally {
if (rule == null) {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create Load Balancer");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create load balancer");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
index f6eb48e..94c5324 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
@@ -37,7 +37,7 @@ import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
@APICommand(name = "createLBHealthCheckPolicy",
- description = "Creates a Load Balancer healthcheck policy ",
+ description = "Creates a load balancer health check policy",
responseObject = LBHealthCheckResponse.class,
since = "4.2.0",
requestHasSensitiveInfo = false,
@@ -59,10 +59,10 @@ public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd {
description = "the ID of the load balancer rule")
private Long lbRuleId;
- @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "the description of the load balancer HealthCheck policy")
+ @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "the description of the load balancer health check policy")
private String description;
- @Parameter(name = ApiConstants.HEALTHCHECK_PINGPATH, type = CommandType.STRING, required = false, description = "HTTP Ping Path")
+ @Parameter(name = ApiConstants.HEALTHCHECK_PINGPATH, type = CommandType.STRING, required = false, description = "HTTP ping path")
private String pingPath;
@Parameter(name = ApiConstants.HEALTHCHECK_RESPONSE_TIMEOUT,
@@ -163,7 +163,7 @@ public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd {
boolean success = false;
try {
- CallContext.current().setEventDetails("Load balancer healthcheck policy Id : " + getEntityId());
+ CallContext.current().setEventDetails("Load balancer health check policy ID : " + getEntityId());
success = _lbService.applyLBHealthCheckPolicy(this);
if (success) {
// State might be different after the rule is applied, so get new object here
@@ -175,7 +175,7 @@ public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd {
}
} finally {
if (!success || (policy == null)) {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create healthcheck policy ");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create health check policy");
}
}
}
@@ -199,6 +199,6 @@ public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd {
@Override
public String getEventDescription() {
- return "Create Load Balancer HealthCheck policy";
+ return "Create load balancer health check policy";
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
index 152f661..45e6f81 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
@@ -40,7 +40,7 @@ import com.cloud.network.rules.LoadBalancer;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.user.Account;
-@APICommand(name = "createLBStickinessPolicy", description = "Creates a Load Balancer stickiness policy ", responseObject = LBStickinessResponse.class, since = "3.0.0",
+@APICommand(name = "createLBStickinessPolicy", description = "Creates a load balancer stickiness policy ", responseObject = LBStickinessResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@SuppressWarnings("rawtypes")
public class CreateLBStickinessPolicyCmd extends BaseAsyncCreateCmd {
@@ -59,16 +59,16 @@ public class CreateLBStickinessPolicyCmd extends BaseAsyncCreateCmd {
description = "the ID of the load balancer rule")
private Long lbRuleId;
- @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "the description of the LB Stickiness policy")
+ @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "the description of the load balancer stickiness policy")
private String description;
- @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "name of the LB Stickiness policy")
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "name of the load balancer stickiness policy")
private String lbStickinessPolicyName;
@Parameter(name = ApiConstants.METHOD_NAME,
type = CommandType.STRING,
required = true,
- description = "name of the LB Stickiness policy method, possible values can be obtained from ListNetworks API ")
+ description = "name of the load balancer stickiness policy method, possible values can be obtained from listNetworks API")
private String stickinessMethodName;
@Parameter(name = ApiConstants.PARAM_LIST, type = CommandType.MAP, description = "param list. Example: param[0].name=cookiename¶m[0].value=LBCookie ")
@@ -152,7 +152,7 @@ public class CreateLBStickinessPolicyCmd extends BaseAsyncCreateCmd {
}
} finally {
if (!success || (policy == null)) {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create stickiness policy ");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create stickiness policy");
}
}
}
@@ -176,7 +176,7 @@ public class CreateLBStickinessPolicyCmd extends BaseAsyncCreateCmd {
@Override
public String getEventDescription() {
- return "creating a Load Balancer Stickiness policy: " + getLBStickinessPolicyName();
+ return "creating a load balancer stickiness policy: " + getLBStickinessPolicyName();
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
index 132bf88..da0c1d3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
@@ -72,13 +72,13 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
@Parameter(name = ApiConstants.PRIVATE_PORT,
type = CommandType.INTEGER,
required = true,
- description = "the private port of the private ip address/virtual machine where the network traffic will be load balanced to")
+ description = "the private port of the private IP address/virtual machine where the network traffic will be load balanced to")
private Integer privatePort;
@Parameter(name = ApiConstants.PUBLIC_IP_ID,
type = CommandType.UUID,
entityType = IPAddressResponse.class,
- description = "public ip address id from where the network traffic will be load balanced from")
+ description = "public IP address ID from where the network traffic will be load balanced from")
private Long publicIpId;
@Parameter(name = ApiConstants.ZONE_ID,
@@ -107,7 +107,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "the domain ID associated with the load balancer")
private Long domainId;
- @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the cidr list to forward traffic from")
+ @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the CIDR list to forward traffic from")
private List<String> cidrlist;
@Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "The guest network this "
@@ -153,7 +153,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
if (publicIpId != null) {
IpAddress ipAddr = _networkService.getIp(publicIpId);
if (ipAddr == null || !ipAddr.readyToUse()) {
- throw new InvalidParameterValueException("Unable to create load balancer rule, invalid IP address id " + publicIpId);
+ throw new InvalidParameterValueException("Unable to create load balancer rule, invalid IP address ID " + publicIpId);
}
} else if (getEntityId() != null) {
LoadBalancer rule = _entityMgr.findById(LoadBalancer.class, getEntityId());
@@ -167,7 +167,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
if (publicIpId != null) {
IpAddress ipAddr = _networkService.getIp(publicIpId);
if (ipAddr == null || !ipAddr.readyToUse()) {
- throw new InvalidParameterValueException("Unable to create load balancer rule, invalid IP address id " + publicIpId);
+ throw new InvalidParameterValueException("Unable to create load balancer rule, invalid IP address ID " + publicIpId);
} else {
return ipAddr.getVpcId();
}
@@ -199,16 +199,16 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
}
if (networks.size() < 1) {
- throw new InvalidParameterValueException("Account doesn't have any Isolated networks in the zone");
+ throw new InvalidParameterValueException("Account doesn't have any isolated networks in the zone");
} else if (networks.size() > 1) {
- throw new InvalidParameterValueException("Account has more than one Isolated network in the zone");
+ throw new InvalidParameterValueException("Account has more than one isolated network in the zone");
}
return networks.get(0).getId();
} else {
Network defaultGuestNetwork = _networkService.getExclusiveGuestNetwork(zoneId);
if (defaultGuestNetwork == null) {
- throw new InvalidParameterValueException("Unable to find a default Guest network for account " + getAccountName() + " in domain id=" + getDomainId());
+ throw new InvalidParameterValueException("Unable to find a default guest network for account " + getAccountName() + " in domain ID=" + getDomainId());
} else {
return defaultGuestNetwork.getId();
}
@@ -218,7 +218,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
if (ipAddr.getAssociatedWithNetworkId() != null) {
return ipAddr.getAssociatedWithNetworkId();
} else {
- throw new InvalidParameterValueException("Ip address id=" + publicIpId + " is not associated with any network");
+ throw new InvalidParameterValueException("IP address ID=" + publicIpId + " is not associated with any network");
}
}
}
@@ -249,7 +249,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
public List<String> getSourceCidrList() {
if (cidrlist != null) {
throw new InvalidParameterValueException(
- "Parameter cidrList is deprecated; if you need to open firewall rule for the specific cidr, please refer to createFirewallRule command");
+ "Parameter cidrList is deprecated; if you need to open firewall rule for the specific CIDR, please refer to createFirewallRule command");
}
return null;
}
@@ -309,7 +309,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
//cidr list parameter is deprecated
if (cidrlist != null) {
throw new InvalidParameterValueException(
- "Parameter cidrList is deprecated; if you need to open firewall rule for the specific cidr, please refer to createFirewallRule command");
+ "Parameter cidrList is deprecated; if you need to open firewall rule for the specific CIDR, please refer to createFirewallRule command");
}
try {
LoadBalancer result =
@@ -350,7 +350,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
if (account != null) {
return account.getId();
} else {
- throw new InvalidParameterValueException("Unable to find account " + accountName + " in domain id=" + domainId);
+ throw new InvalidParameterValueException("Unable to find account " + accountName + " in domain ID=" + domainId);
}
} else {
throw new InvalidParameterValueException("Can't define IP owner. Either specify account/domainId or publicIpId");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
index 8f4ecca..a723279 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
@@ -84,7 +84,7 @@ public class DeleteApplicationLoadBalancerCmd extends BaseAsyncCmd {
@Override
public void execute() {
- CallContext.current().setEventDetails("Load balancer Id: " + getId());
+ CallContext.current().setEventDetails("Load balancer ID: " + getId());
boolean result = _appLbService.deleteApplicationLoadBalancer(getId());
if (result) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
index 3f27477..74df888 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
@@ -34,7 +34,7 @@ import com.cloud.network.rules.HealthCheckPolicy;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
-@APICommand(name = "deleteLBHealthCheckPolicy", description = "Deletes a load balancer HealthCheck policy.", responseObject = SuccessResponse.class, since = "4.2.0",
+@APICommand(name = "deleteLBHealthCheckPolicy", description = "Deletes a load balancer health check policy.", responseObject = SuccessResponse.class, since = "4.2.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteLBHealthCheckPolicyCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteLBHealthCheckPolicyCmd.class.getName());
@@ -47,7 +47,7 @@ public class DeleteLBHealthCheckPolicyCmd extends BaseAsyncCmd {
type = CommandType.UUID,
entityType = LBHealthCheckResponse.class,
required = true,
- description = "the ID of the load balancer HealthCheck policy")
+ description = "the ID of the load balancer health check policy")
private Long id;
// ///////////////////////////////////////////////////
@@ -84,19 +84,19 @@ public class DeleteLBHealthCheckPolicyCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return "deleting load balancer HealthCheck policy: " + getId();
+ return "deleting load balancer health check policy: " + getId();
}
@Override
public void execute() {
- CallContext.current().setEventDetails("Load balancer healthcheck policy Id: " + getId());
+ CallContext.current().setEventDetails("Load balancer health check policy Id: " + getId());
boolean result = _lbService.deleteLBHealthCheckPolicy(getId(), true);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete load balancer healthcheck policy");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete load balancer health check policy");
}
}
@@ -109,11 +109,11 @@ public class DeleteLBHealthCheckPolicyCmd extends BaseAsyncCmd {
public Long getSyncObjId() {
HealthCheckPolicy policy = _entityMgr.findById(HealthCheckPolicy.class, getId());
if (policy == null) {
- throw new InvalidParameterValueException("Unable to find load balancer healthcheck rule: " + id);
+ throw new InvalidParameterValueException("Unable to find load balancer health check rule: " + id);
}
LoadBalancer lb = _lbService.findById(policy.getLoadBalancerId());
if (lb == null) {
- throw new InvalidParameterValueException("Unable to find load balancer rule for healthcheck rule: " + id);
+ throw new InvalidParameterValueException("Unable to find load balancer rule for health check rule: " + id);
}
return lb.getNetworkId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
index ffed94b..10c3429 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java
@@ -34,7 +34,7 @@ import com.cloud.network.rules.LoadBalancer;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.user.Account;
-@APICommand(name = "deleteLBStickinessPolicy", description = "Deletes a LB stickiness policy.", responseObject = SuccessResponse.class, since = "3.0.0",
+@APICommand(name = "deleteLBStickinessPolicy", description = "Deletes a load balancer stickiness policy.", responseObject = SuccessResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteLBStickinessPolicyCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteLBStickinessPolicyCmd.class.getName());
@@ -89,7 +89,7 @@ public class DeleteLBStickinessPolicyCmd extends BaseAsyncCmd {
@Override
public void execute() {
- CallContext.current().setEventDetails("Load balancer stickiness policy Id: " + getId());
+ CallContext.current().setEventDetails("Load balancer stickiness policy ID: " + getId());
boolean result = _lbService.deleteLBStickinessPolicy(getId(), true);
if (result) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
index 3423cab..112f6cf 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
@@ -89,7 +89,7 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
@Override
public void execute() {
- CallContext.current().setEventDetails("Load balancer Id: " + getId());
+ CallContext.current().setEventDetails("Load balancer ID: " + getId());
boolean result = _firewallService.revokeRelatedFirewallRule(id, true);
result = result && _lbService.deleteLoadBalancerRule(id, true);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
index fab1125..2efd036 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
@@ -37,7 +37,7 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.lb.CertService;
import com.cloud.utils.exception.CloudRuntimeException;
-@APICommand(name = "deleteSslCert", description = "Delete a certificate to cloudstack", responseObject = SuccessResponse.class,
+@APICommand(name = "deleteSslCert", description = "Delete a certificate to CloudStack", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSslCertCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteSslCertCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
index 299d730..79322c2 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
@@ -35,7 +35,7 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
import com.cloud.utils.Pair;
-@APICommand(name = "listLoadBalancers", description = "Lists Load Balancers", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
+@APICommand(name = "listLoadBalancers", description = "Lists load balancers", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListApplicationLoadBalancersCmd.class.getName());
@@ -46,25 +46,25 @@ public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, description = "the ID of the Load Balancer")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, description = "the ID of the load balancer")
private Long id;
- @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name of the Load Balancer")
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name of the load balancer")
private String loadBalancerName;
- @Parameter(name = ApiConstants.SOURCE_IP, type = CommandType.STRING, description = "the source ip address of the Load Balancer")
+ @Parameter(name = ApiConstants.SOURCE_IP, type = CommandType.STRING, description = "the source IP address of the load balancer")
private String sourceIp;
@Parameter(name = ApiConstants.SOURCE_IP_NETWORK_ID,
type = CommandType.UUID,
entityType = NetworkResponse.class,
- description = "the network id of the source ip address")
+ description = "the network ID of the source IP address")
private Long sourceIpNetworkId;
- @Parameter(name = ApiConstants.SCHEME, type = CommandType.STRING, description = "the scheme of the Load Balancer. Supported value is Internal in the current release")
+ @Parameter(name = ApiConstants.SCHEME, type = CommandType.STRING, description = "the scheme of the load balancer. Supported value is internal in the current release")
private String scheme;
- @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "the network id of the Load Balancer")
+ @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "the network ID of the load balancer")
private Long networkId;
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "list resources by display flag; only ROOT admin is eligible to pass this parameter", since = "4.4", authorized = {RoleType.Admin})
@@ -112,7 +112,7 @@ public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd
if (scheme.equalsIgnoreCase(Scheme.Internal.toString())) {
return Scheme.Internal;
} else {
- throw new InvalidParameterValueException("Invalid value for scheme. Supported value is Internal");
+ throw new InvalidParameterValueException("Invalid value for scheme. Supported value is internal");
}
}
return null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
index 3f2082a..ad0486f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
@@ -34,7 +34,7 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.HealthCheckPolicy;
import com.cloud.network.rules.LoadBalancer;
-@APICommand(name = "listLBHealthCheckPolicies", description = "Lists load balancer HealthCheck policies.", responseObject = LBHealthCheckResponse.class, since = "4.2.0",
+@APICommand(name = "listLBHealthCheckPolicies", description = "Lists load balancer health check policies.", responseObject = LBHealthCheckResponse.class, since = "4.2.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListLBHealthCheckPoliciesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListLBHealthCheckPoliciesCmd.class.getName());
@@ -53,7 +53,7 @@ public class ListLBHealthCheckPoliciesCmd extends BaseListCmd {
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "list resources by display flag; only ROOT admin is eligible to pass this parameter", since = "4.4", authorized = {RoleType.Admin})
private Boolean display;
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = LBHealthCheckResponse.class, description = "the ID of the healthcheck policy", since = "4.4")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = LBHealthCheckResponse.class, description = "the ID of the health check policy", since = "4.4")
private Long id;
// ///////////////////////////////////////////////////
@@ -93,7 +93,7 @@ public class ListLBHealthCheckPoliciesCmd extends BaseListCmd {
if(hId != null) {
lbRuleId = _lbService.findLBIdByHealtCheckPolicyId(hId);
} else {
- throw new InvalidParameterValueException("Either LB Ruleid or HealthCheckpolicy Id should be specified");
+ throw new InvalidParameterValueException("Either load balancer rule ID or health check policy ID should be specified");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
index 6477621..4e11430 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
@@ -35,7 +35,7 @@ import com.cloud.network.rules.LoadBalancer;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.user.Account;
-@APICommand(name = "listLBStickinessPolicies", description = "Lists LBStickiness policies.", responseObject = LBStickinessResponse.class, since = "3.0.0",
+@APICommand(name = "listLBStickinessPolicies", description = "Lists load balancer stickiness policies.", responseObject = LBStickinessResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListLBStickinessPoliciesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListLBStickinessPoliciesCmd.class.getName());
@@ -93,17 +93,17 @@ public class ListLBStickinessPoliciesCmd extends BaseListCmd {
LoadBalancer lb = null;
if (lbRuleId == null && id == null) {
- throw new InvalidParameterValueException("LB rule id and stickiness policy id can't be null");
+ throw new InvalidParameterValueException("load balancer rule ID and stickiness policy ID can't be null");
}
if (id != null) {
lb = _lbService.findLbByStickinessId(id);
if (lb == null) {
- throw new InvalidParameterValueException("stickiness policy id doesn't exist");
+ throw new InvalidParameterValueException("stickiness policy ID doesn't exist");
}
if ((lbRuleId != null) && (lbRuleId != lb.getId())) {
- throw new InvalidParameterValueException("stickiness policy id doesn't belong to lbId" + lbRuleId);
+ throw new InvalidParameterValueException("stickiness policy ID doesn't belong to lbId" + lbRuleId);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
index 8827557..e3cde0b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
@@ -62,7 +62,7 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
@Parameter(name = ApiConstants.LIST_LB_VMIPS,
type = CommandType.BOOLEAN,
- description = "true if lb rule vm ip information to be included; default is false")
+ description = "true if load balancer rule VM IP information to be included; default is false")
private boolean isListLbVmip;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
index 71d8232..d1fa8da 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
@@ -56,7 +56,7 @@ public class ListLoadBalancerRulesCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.PUBLIC_IP_ID,
type = CommandType.UUID,
entityType = IPAddressResponse.class,
- description = "the public IP address id of the load balancer rule ")
+ description = "the public IP address ID of the load balancer rule")
private Long publicIpId;
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
@@ -68,7 +68,7 @@ public class ListLoadBalancerRulesCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the availability zone ID")
private Long zoneId;
- @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list by network id the rule belongs to")
+ @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list by network ID the rule belongs to")
private Long networkId;
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "list resources by display flag; only ROOT admin is eligible to pass this parameter", since = "4.4", authorized = {RoleType.Admin})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
index 470968f..d1dbdcb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
@@ -50,16 +50,16 @@ public class ListSslCertsCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.CERTIFICATE_ID, type = CommandType.UUID, entityType = SslCertResponse.class, required = false, description = "Id of SSL certificate")
+ @Parameter(name = ApiConstants.CERTIFICATE_ID, type = CommandType.UUID, entityType = SslCertResponse.class, required = false, description = "ID of SSL certificate")
private Long certId;
- @Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, required = false, description = "Account Id")
+ @Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, required = false, description = "Account ID")
private Long accountId;
- @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = false, description = "Loadbalancer Rule Id")
+ @Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = false, description = "Load balancer rule ID")
private Long lbId;
- @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, required = false, description = "project who owns the ssl cert")
+ @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, required = false, description = "Project that owns the SSL certificate")
private Long projectId;
/////////////////////////////////////////////////////
@@ -111,4 +111,4 @@ public class ListSslCertsCmd extends BaseCmd {
public long getEntityOwnerId() {
return CallContext.current().getCallingAccount().getId();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
index 14da089..d794384 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
@@ -36,7 +36,7 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.Account;
-@APICommand(name = "removeCertFromLoadBalancer", description = "Removes a certificate from a Load Balancer Rule", responseObject = SuccessResponse.class,
+@APICommand(name = "removeCertFromLoadBalancer", description = "Removes a certificate from a load balancer rule", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd {
@@ -75,7 +75,7 @@ public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return "Removing a certificate from a loadbalancer with ID " + getLbRuleId();
+ return "Removing a certificate from a load balancer with ID " + getLbRuleId();
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
index fbda84d..3dd1564 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
@@ -31,7 +31,7 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.FirewallRule;
-@APICommand(name = "updateLoadBalancer", description = "Updates a Load Balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.4.0",
+@APICommand(name = "updateLoadBalancer", description = "Updates a load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.4.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateApplicationLoadBalancerCmd.class.getName());
@@ -41,7 +41,7 @@ public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the Load Balancer")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the load balancer")
private Long id;
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the rule to the end user or not", since = "4.4", authorized = {RoleType.Admin})
@@ -69,7 +69,7 @@ public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd {
if (lb != null) {
return lb.getAccountId();
} else {
- throw new InvalidParameterValueException("Can't find load balancer by id specified");
+ throw new InvalidParameterValueException("Can't find load balancer by ID specified");
}
}
@@ -89,7 +89,7 @@ public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd {
/////////////////////////////////////////////////////
@Override
public void execute() {
- CallContext.current().setEventDetails("Load balancer Id: " + getId());
+ CallContext.current().setEventDetails("Load balancer ID: " + getId());
ApplicationLoadBalancerRule rule = _appLbService.updateApplicationLoadBalancer(getId(), this.getCustomId(), getDisplay());
ApplicationLoadBalancerResponse lbResponse = _responseGenerator.createLoadBalancerContainerReponse(rule, _lbService.getLbInstances(getId()));
setResponseObject(lbResponse);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java
index 0b0c34f..06d9263 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java
@@ -27,7 +27,7 @@ import com.cloud.network.rules.LoadBalancer;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.user.Account;
-@APICommand(name = "updateLBHealthCheckPolicy", description = "Updates LB HealthCheck policy", responseObject = LBHealthCheckResponse.class, since = "4.4",
+@APICommand(name = "updateLBHealthCheckPolicy", description = "Updates load balancer health check policy", responseObject = LBHealthCheckResponse.class, since = "4.4",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateLBHealthCheckPolicyCmd extends BaseAsyncCustomIdCmd{
public static final Logger s_logger = Logger.getLogger(UpdateLBHealthCheckPolicyCmd.class.getName());
@@ -37,7 +37,7 @@ public class UpdateLBHealthCheckPolicyCmd extends BaseAsyncCustomIdCmd{
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = LBHealthCheckResponse.class, required = true, description = "id of lb healthcheck policy")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = LBHealthCheckResponse.class, required = true, description = "ID of load balancer health check policy")
private Long id;
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the policy to the end user or not", since = "4.4", authorized = {RoleType.Admin})
@@ -71,7 +71,7 @@ public class UpdateLBHealthCheckPolicyCmd extends BaseAsyncCustomIdCmd{
@Override
public String getEventDescription() {
- return "Update LB healthcheck policy id= " + id;
+ return "Update load balancer health check policy ID= " + id;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java
index c652945..55b3d57 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java
@@ -26,7 +26,7 @@ import com.cloud.network.rules.LoadBalancer;
import com.cloud.network.rules.StickinessPolicy;
import com.cloud.user.Account;
-@APICommand(name = "updateLBStickinessPolicy", description = "Updates LB Stickiness policy", responseObject = LBStickinessResponse.class, since = "4.4",
+@APICommand(name = "updateLBStickinessPolicy", description = "Updates load balancer stickiness policy", responseObject = LBStickinessResponse.class, since = "4.4",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateLBStickinessPolicyCmd extends BaseAsyncCustomIdCmd{
public static final Logger s_logger = Logger.getLogger(UpdateLBStickinessPolicyCmd.class.getName());
@@ -70,7 +70,7 @@ public class UpdateLBStickinessPolicyCmd extends BaseAsyncCustomIdCmd{
@Override
public String getEventDescription() {
- return "Update LB stickiness policy id= " + id;
+ return "Update load balancer stickiness policy ID= " + id;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
index 03dd621..6b1e0fd 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
@@ -55,7 +55,7 @@ public class UpdateLoadBalancerRuleCmd extends BaseAsyncCustomIdCmd {
type = CommandType.UUID,
entityType = FirewallRuleResponse.class,
required = true,
- description = "the id of the load balancer rule to update")
+ description = "the ID of the load balancer rule to update")
private Long id;
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name of the load balancer rule")
@@ -118,7 +118,7 @@ public class UpdateLoadBalancerRuleCmd extends BaseAsyncCustomIdCmd {
@Override
public void execute() {
- CallContext.current().setEventDetails("Load balancer Id: " + getId());
+ CallContext.current().setEventDetails("Load balancer ID: " + getId());
LoadBalancer result = _lbService.updateLoadBalancerRule(this);
if (result != null) {
LoadBalancerResponse response = _responseGenerator.createLoadBalancerResponse(result);
@@ -138,7 +138,7 @@ public class UpdateLoadBalancerRuleCmd extends BaseAsyncCustomIdCmd {
public Long getSyncObjId() {
LoadBalancer lb = _lbService.findById(getId());
if (lb == null) {
- throw new InvalidParameterValueException("Unable to find load balancer rule " + getId());
+ throw new InvalidParameterValueException("Unable to find load balancer rule by ID " + getId());
}
return lb.getNetworkId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1fbb782/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
index cd5bb27..4bd2de9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
@@ -38,7 +38,7 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.lb.CertService;
-@APICommand(name = "uploadSslCert", description = "Upload a certificate to cloudstack", responseObject = SslCertResponse.class,
+@APICommand(name = "uploadSslCert", description = "Upload a certificate to CloudStack", responseObject = SslCertResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UploadSslCertCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UploadSslCertCmd.class.getName());
@@ -64,13 +64,13 @@ public class UploadSslCertCmd extends BaseCmd {
@Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, description = "Password for the private key")
private String password;
- @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account who will own the ssl cert")
+ @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account that will own the SSL certificate")
private String accountName;
- @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the ssl cert")
+ @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the SSL certificate")
private Long projectId;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "domain ID of the account owning the ssl cert")
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "domain ID of the account owning the SSL certificate")
private Long domainId;
/////////////////////////////////////////////////////
@@ -133,4 +133,4 @@ public class UploadSslCertCmd extends BaseCmd {
return CallContext.current().getCallingAccount().getId();
}
-}
\ No newline at end of file
+}
[03/10] git commit: updated refs/heads/master to 84266b1
Posted by da...@apache.org.
queryService: fix style, remove public statement on interfaces
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3824d997
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3824d997
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3824d997
Branch: refs/heads/master
Commit: 3824d997d6b2741e31be187680155be46f682203
Parents: 59388b0
Author: Rene Moser <re...@apache.org>
Authored: Wed May 20 20:58:15 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:17 2015 +0200
----------------------------------------------------------------------
.../apache/cloudstack/query/QueryService.java | 56 ++++++++++----------
1 file changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3824d997/api/src/org/apache/cloudstack/query/QueryService.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/query/QueryService.java b/api/src/org/apache/cloudstack/query/QueryService.java
index a39a2d7..0cf05a6 100644
--- a/api/src/org/apache/cloudstack/query/QueryService.java
+++ b/api/src/org/apache/cloudstack/query/QueryService.java
@@ -80,60 +80,62 @@ import com.cloud.exception.PermissionDeniedException;
*/
public interface QueryService {
- public ListResponse<UserResponse> searchForUsers(ListUsersCmd cmd) throws PermissionDeniedException;
+ ListResponse<UserResponse> searchForUsers(ListUsersCmd cmd) throws PermissionDeniedException;
- public ListResponse<EventResponse> searchForEvents(ListEventsCmd cmd);
+ ListResponse<EventResponse> searchForEvents(ListEventsCmd cmd);
- public ListResponse<ResourceTagResponse> listTags(ListTagsCmd cmd);
+ ListResponse<ResourceTagResponse> listTags(ListTagsCmd cmd);
- public ListResponse<InstanceGroupResponse> searchForVmGroups(ListVMGroupsCmd cmd);
+ ListResponse<InstanceGroupResponse> searchForVmGroups(ListVMGroupsCmd cmd);
- public ListResponse<UserVmResponse> searchForUserVMs(ListVMsCmd cmd);
+ ListResponse<UserVmResponse> searchForUserVMs(ListVMsCmd cmd);
- public ListResponse<SecurityGroupResponse> searchForSecurityGroups(ListSecurityGroupsCmd cmd);
+ ListResponse<SecurityGroupResponse> searchForSecurityGroups(ListSecurityGroupsCmd cmd);
- public ListResponse<DomainRouterResponse> searchForRouters(ListRoutersCmd cmd);
+ ListResponse<DomainRouterResponse> searchForRouters(ListRoutersCmd cmd);
- public ListResponse<ProjectInvitationResponse> listProjectInvitations(ListProjectInvitationsCmd cmd);
+ ListResponse<ProjectInvitationResponse> listProjectInvitations(ListProjectInvitationsCmd cmd);
- public ListResponse<ProjectResponse> listProjects(ListProjectsCmd cmd);
+ ListResponse<ProjectResponse> listProjects(ListProjectsCmd cmd);
- public ListResponse<ProjectAccountResponse> listProjectAccounts(ListProjectAccountsCmd cmd);
+ ListResponse<ProjectAccountResponse> listProjectAccounts(ListProjectAccountsCmd cmd);
- public ListResponse<HostResponse> searchForServers(ListHostsCmd cmd);
+ ListResponse<HostResponse> searchForServers(ListHostsCmd cmd);
- public ListResponse<VolumeResponse> searchForVolumes(ListVolumesCmd cmd);
+ ListResponse<VolumeResponse> searchForVolumes(ListVolumesCmd cmd);
- public ListResponse<StoragePoolResponse> searchForStoragePools(ListStoragePoolsCmd cmd);
+ ListResponse<StoragePoolResponse> searchForStoragePools(ListStoragePoolsCmd cmd);
- public ListResponse<ImageStoreResponse> searchForImageStores(ListImageStoresCmd cmd);
+ ListResponse<ImageStoreResponse> searchForImageStores(ListImageStoresCmd cmd);
- public ListResponse<ImageStoreResponse> searchForSecondaryStagingStores(ListSecondaryStagingStoresCmd cmd);
+ ListResponse<ImageStoreResponse> searchForSecondaryStagingStores(ListSecondaryStagingStoresCmd cmd);
- public ListResponse<DomainResponse> searchForDomains(ListDomainsCmd cmd);
+ ListResponse<DomainResponse> searchForDomains(ListDomainsCmd cmd);
- public ListResponse<AccountResponse> searchForAccounts(ListAccountsCmd cmd);
+ ListResponse<AccountResponse> searchForAccounts(ListAccountsCmd cmd);
- public ListResponse<AsyncJobResponse> searchForAsyncJobs(ListAsyncJobsCmd cmd);
+ ListResponse<AsyncJobResponse> searchForAsyncJobs(ListAsyncJobsCmd cmd);
- public ListResponse<DiskOfferingResponse> searchForDiskOfferings(ListDiskOfferingsCmd cmd);
+ ListResponse<DiskOfferingResponse> searchForDiskOfferings(ListDiskOfferingsCmd cmd);
- public ListResponse<ServiceOfferingResponse> searchForServiceOfferings(ListServiceOfferingsCmd cmd);
+ ListResponse<ServiceOfferingResponse> searchForServiceOfferings(ListServiceOfferingsCmd cmd);
- public ListResponse<ZoneResponse> listDataCenters(ListZonesCmd cmd);
+ ListResponse<ZoneResponse> listDataCenters(ListZonesCmd cmd);
- public ListResponse<TemplateResponse> listTemplates(ListTemplatesCmd cmd);
+ ListResponse<TemplateResponse> listTemplates(ListTemplatesCmd cmd);
- public ListResponse<TemplateResponse> listIsos(ListIsosCmd cmd);
+ ListResponse<TemplateResponse> listIsos(ListIsosCmd cmd);
- public ListResponse<AffinityGroupResponse> listAffinityGroups(Long affinityGroupId, String affinityGroupName,
+ ListResponse<AffinityGroupResponse> listAffinityGroups(Long affinityGroupId, String affinityGroupName,
String affinityGroupType, Long vmId, String accountName, Long domainId, boolean isRecursive,
boolean listAll, Long startIndex, Long pageSize, String keyword);
- public List<ResourceDetailResponse> listResourceDetails(ListResourceDetailsCmd cmd);
+ List<ResourceDetailResponse> listResourceDetails(ListResourceDetailsCmd cmd);
ListResponse<DomainRouterResponse> searchForInternalLbVms(ListInternalLBVMsCmd cmd);
- public ListResponse<StorageTagResponse> searchForStorageTags(ListStorageTagsCmd cmd);
- public ListResponse<HostTagResponse> searchForHostTags(ListHostTagsCmd cmd);
+
+ ListResponse<StorageTagResponse> searchForStorageTags(ListStorageTagsCmd cmd);
+
+ ListResponse<HostTagResponse> searchForHostTags(ListHostTagsCmd cmd);
}
[10/10] git commit: updated refs/heads/master to 84266b1
Posted by da...@apache.org.
api: network: fix and reformat descriptions
Signed-off-by: Daan Hoogland <da...@gmail.com>
This closes #275
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/84266b1c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/84266b1c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/84266b1c
Branch: refs/heads/master
Commit: 84266b1c727056246b26721cc9be90b9c0a07320
Parents: c1fbb78
Author: Rene Moser <re...@apache.org>
Authored: Thu May 21 10:43:14 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:19 2015 +0200
----------------------------------------------------------------------
.../user/nat/CreateIpForwardingRuleCmd.java | 22 +++++++--------
.../user/nat/DeleteIpForwardingRuleCmd.java | 12 ++++-----
.../command/user/nat/DisableStaticNatCmd.java | 10 +++----
.../command/user/nat/EnableStaticNatCmd.java | 18 ++++++-------
.../user/nat/ListIpForwardingRulesCmd.java | 6 ++---
.../user/network/CreateNetworkACLCmd.java | 16 +++++------
.../user/network/CreateNetworkACLListCmd.java | 10 +++----
.../command/user/network/CreateNetworkCmd.java | 28 ++++++++++----------
.../user/network/DeleteNetworkACLCmd.java | 8 +++---
.../user/network/DeleteNetworkACLListCmd.java | 6 ++---
.../command/user/network/DeleteNetworkCmd.java | 2 +-
.../user/network/ListNetworkACLListsCmd.java | 4 +--
.../user/network/ListNetworkACLsCmd.java | 10 +++----
.../user/network/ListNetworkOfferingsCmd.java | 10 +++----
.../command/user/network/ListNetworksCmd.java | 14 +++++-----
.../user/network/ReplaceNetworkACLListCmd.java | 10 +++----
.../command/user/network/RestartNetworkCmd.java | 8 +++---
.../user/network/UpdateNetworkACLItemCmd.java | 12 ++++-----
.../user/network/UpdateNetworkACLListCmd.java | 4 +--
.../command/user/network/UpdateNetworkCmd.java | 14 +++++-----
20 files changed, 112 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
index 8925d06..94db915 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
@@ -42,7 +42,7 @@ import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.StaticNatRule;
import com.cloud.user.Account;
-@APICommand(name = "createIpForwardingRule", description = "Creates an ip forwarding rule", responseObject = FirewallRuleResponse.class,
+@APICommand(name = "createIpForwardingRule", description = "Creates an IP forwarding rule", responseObject = FirewallRuleResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements StaticNatRule {
public static final Logger s_logger = Logger.getLogger(CreateIpForwardingRuleCmd.class.getName());
@@ -57,7 +57,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
type = CommandType.UUID,
entityType = IPAddressResponse.class,
required = true,
- description = "the public IP address id of the forwarding rule, already associated via associateIp")
+ description = "the public IP address ID of the forwarding rule, already associated via associateIp")
private Long ipAddressId;
@Parameter(name = ApiConstants.START_PORT, type = CommandType.INTEGER, required = true, description = "the start port for the rule")
@@ -71,10 +71,10 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
@Parameter(name = ApiConstants.OPEN_FIREWALL,
type = CommandType.BOOLEAN,
- description = "if true, firewall rule for source/end pubic port is automatically created; if false - firewall rule has to be created explicitely. Has value true by default")
+ description = "if true, firewall rule for source/end pubic port is automatically created; if false - firewall rule has to be created explicitly. Has value true by default")
private Boolean openFirewall;
- @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the cidr list to forward traffic from")
+ @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the CIDR list to forward traffic from")
private List<String> cidrlist;
/////////////////////////////////////////////////////
@@ -116,7 +116,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
boolean result = true;
FirewallRule rule = null;
try {
- CallContext.current().setEventDetails("Rule Id: " + getEntityId());
+ CallContext.current().setEventDetails("Rule ID: " + getEntityId());
if (getOpenFirewall()) {
result = result && _firewallService.applyIngressFirewallRules(ipAddressId, CallContext.current().getCallingAccount());
@@ -137,7 +137,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
_rulesService.revokeStaticNatRule(getEntityId(), true);
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Error in creating ip forwarding rule on the domr");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Error in creating IP forwarding rule on the domr");
}
}
}
@@ -148,7 +148,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
//cidr list parameter is deprecated
if (cidrlist != null) {
throw new InvalidParameterValueException(
- "Parameter cidrList is deprecated; if you need to open firewall rule for the specific cidr, please refer to createFirewallRule command");
+ "Parameter cidrList is deprecated; if you need to open firewall rule for the specific CIDR, please refer to createFirewallRule command");
}
try {
@@ -156,7 +156,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
setEntityId(rule.getId());
setEntityUuid(rule.getUuid());
} catch (NetworkRuleConflictException e) {
- s_logger.info("Unable to create Static Nat Rule due to ", e);
+ s_logger.info("Unable to create static NAT rule due to ", e);
throw new ServerApiException(ApiErrorCode.NETWORK_RULE_CONFLICT_ERROR, e.getMessage());
}
}
@@ -180,14 +180,14 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
@Override
public String getEventDescription() {
IpAddress ip = _networkService.getIp(ipAddressId);
- return ("Applying an ipforwarding 1:1 NAT rule for Ip: " + ip.getAddress() + " with virtual machine:" + getVirtualMachineId());
+ return ("Applying an ipforwarding 1:1 NAT rule for IP: " + ip.getAddress() + " with virtual machine:" + getVirtualMachineId());
}
private long getVirtualMachineId() {
Long vmId = _networkService.getIp(ipAddressId).getAssociatedWithVmId();
if (vmId == null) {
- throw new InvalidParameterValueException("Ip address is not associated with any network, unable to create static nat rule");
+ throw new InvalidParameterValueException("IP address is not associated with any network, unable to create static NAT rule");
}
return vmId;
}
@@ -278,7 +278,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
private IpAddress getIp() {
IpAddress ip = _networkService.getIp(ipAddressId);
if (ip == null) {
- throw new InvalidParameterValueException("Unable to find ip address by id " + ipAddressId);
+ throw new InvalidParameterValueException("Unable to find IP address by ID " + ipAddressId);
}
return ip;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
index 52a5ba7..9059d50 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
@@ -34,7 +34,7 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.rules.FirewallRule;
-@APICommand(name = "deleteIpForwardingRule", description = "Deletes an ip forwarding rule", responseObject = SuccessResponse.class,
+@APICommand(name = "deleteIpForwardingRule", description = "Deletes an IP forwarding rule", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteIpForwardingRuleCmd.class.getName());
@@ -45,7 +45,7 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the id of the forwarding rule")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, required = true, description = "the ID of the forwarding rule")
private Long id;
// unexposed parameter needed for events logging
@@ -71,7 +71,7 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
@Override
public void execute() {
- CallContext.current().setEventDetails("Rule Id: " + id);
+ CallContext.current().setEventDetails("Rule ID: " + id);
boolean result = _firewallService.revokeRelatedFirewallRule(id, true);
result = result && _rulesService.revokeStaticNatRule(id, true);
@@ -79,7 +79,7 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
SuccessResponse response = new SuccessResponse(getCommandName());
setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete ip forwarding rule");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete IP forwarding rule");
}
}
@@ -88,7 +88,7 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
if (ownerId == null) {
FirewallRule rule = _entityMgr.findById(FirewallRule.class, id);
if (rule == null) {
- throw new InvalidParameterValueException("Unable to find static nat rule by id: " + id);
+ throw new InvalidParameterValueException("Unable to find static NAT rule by ID: " + id);
} else {
ownerId = rule.getAccountId();
}
@@ -103,7 +103,7 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return ("Deleting an ipforwarding 1:1 NAT rule id:" + id);
+ return ("Deleting an IP forwarding 1:1 NAT rule ID:" + id);
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
index 1df77ec..6c59e70 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
@@ -35,7 +35,7 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.IpAddress;
-@APICommand(name = "disableStaticNat", description = "Disables static rule for given ip address", responseObject = SuccessResponse.class,
+@APICommand(name = "disableStaticNat", description = "Disables static rule for given IP address", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DisableStaticNatCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeletePortForwardingRuleCmd.class.getName());
@@ -49,7 +49,7 @@ public class DisableStaticNatCmd extends BaseAsyncCmd {
type = CommandType.UUID,
entityType = IPAddressResponse.class,
required = true,
- description = "the public IP address id for which static nat feature is being disableed")
+ description = "the public IP address ID for which static NAT feature is being disabled")
private Long ipAddressId;
/////////////////////////////////////////////////////
@@ -75,7 +75,7 @@ public class DisableStaticNatCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return ("Disabling static nat for ip id=" + ipAddressId);
+ return ("Disabling static NAT for IP ID=" + ipAddressId);
}
@Override
@@ -91,7 +91,7 @@ public class DisableStaticNatCmd extends BaseAsyncCmd {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to disable static nat");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to disable static NAT");
}
}
@@ -108,7 +108,7 @@ public class DisableStaticNatCmd extends BaseAsyncCmd {
private IpAddress getIp() {
IpAddress ip = _networkService.getIp(ipAddressId);
if (ip == null) {
- throw new InvalidParameterValueException("Unable to find ip address by id " + ipAddressId);
+ throw new InvalidParameterValueException("Unable to find IP address by ID " + ipAddressId);
}
return ip;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
index aa4e287..cddd23d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
@@ -36,7 +36,7 @@ import com.cloud.network.IpAddress;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "enableStaticNat", description = "Enables static nat for given ip address", responseObject = SuccessResponse.class,
+@APICommand(name = "enableStaticNat", description = "Enables static NAT for given IP address", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class EnableStaticNatCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateIpForwardingRuleCmd.class.getName());
@@ -48,23 +48,23 @@ public class EnableStaticNatCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Parameter(name = ApiConstants.IP_ADDRESS_ID, type = CommandType.UUID, entityType = IPAddressResponse.class, required = true, description = "the public IP "
- + "address id for which static nat feature is being enabled")
+ + "address ID for which static NAT feature is being enabled")
private Long ipAddressId;
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "the ID of "
- + "the virtual machine for enabling static nat feature")
+ + "the virtual machine for enabling static NAT feature")
private Long virtualMachineId;
@Parameter(name = ApiConstants.NETWORK_ID,
type = CommandType.UUID,
entityType = NetworkResponse.class,
- description = "The network of the vm the static nat will be enabled for."
- + " Required when public Ip address is not associated with any Guest network yet (VPC case)")
+ description = "The network of the VM the static NAT will be enabled for."
+ + " Required when public IP address is not associated with any guest network yet (VPC case)")
private Long networkId;
@Parameter(name = ApiConstants.VM_GUEST_IP,
type = CommandType.STRING,
required = false,
- description = "VM guest nic Secondary ip address for the port forwarding rule")
+ description = "VM guest NIC secondary IP address for the port forwarding rule")
private String vmSecondaryIp;
/////////////////////////////////////////////////////
@@ -102,8 +102,8 @@ public class EnableStaticNatCmd extends BaseCmd {
}
if (ntwkId == null) {
- throw new InvalidParameterValueException("Unable to enable static nat for the ipAddress id=" + ipAddressId +
- " as ip is not associated with any network and no networkId is passed in");
+ throw new InvalidParameterValueException("Unable to enable static NAT for the ipAddress id=" + ipAddressId +
+ " as IP is not associated with any network and no networkId is passed in");
}
return ntwkId;
}
@@ -135,7 +135,7 @@ public class EnableStaticNatCmd extends BaseCmd {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to enable static nat");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to enable static NAT");
}
} catch (NetworkRuleConflictException ex) {
s_logger.info("Network rule conflict: " + ex.getMessage());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
index ecb0c44..bc157fc 100644
--- a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
@@ -35,7 +35,7 @@ import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.StaticNatRule;
import com.cloud.utils.Pair;
-@APICommand(name = "listIpForwardingRules", description = "List the ip forwarding rules", responseObject = FirewallRuleResponse.class,
+@APICommand(name = "listIpForwardingRules", description = "List the IP forwarding rules", responseObject = FirewallRuleResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListIpForwardingRulesCmd.class.getName());
@@ -49,7 +49,7 @@ public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResources
@Parameter(name = ApiConstants.IP_ADDRESS_ID,
type = CommandType.UUID,
entityType = IPAddressResponse.class,
- description = "list the rule belonging to this public ip address")
+ description = "list the rule belonging to this public IP address")
private Long publicIpAddressId;
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = FirewallRuleResponse.class, description = "Lists rule with the specified ID.")
@@ -58,7 +58,7 @@ public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResources
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
type = CommandType.UUID,
entityType = UserVmResponse.class,
- description = "Lists all rules applied to the specified Vm.")
+ description = "Lists all rules applied to the specified VM.")
private Long vmId;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
index b4d5489..c8a8f8c 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
@@ -66,32 +66,32 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.END_PORT, type = CommandType.INTEGER, description = "the ending port of ACL")
private Integer publicEndPort;
- @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the cidr list to allow traffic from/to")
+ @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the CIDR list to allow traffic from/to")
private List<String> cidrlist;
- @Parameter(name = ApiConstants.ICMP_TYPE, type = CommandType.INTEGER, description = "type of the icmp message being sent")
+ @Parameter(name = ApiConstants.ICMP_TYPE, type = CommandType.INTEGER, description = "type of the ICMP message being sent")
private Integer icmpType;
- @Parameter(name = ApiConstants.ICMP_CODE, type = CommandType.INTEGER, description = "error code for this icmp message")
+ @Parameter(name = ApiConstants.ICMP_CODE, type = CommandType.INTEGER, description = "error code for this ICMP message")
private Integer icmpCode;
@Parameter(name = ApiConstants.NETWORK_ID,
type = CommandType.UUID,
entityType = NetworkResponse.class,
- description = "The network of the vm the ACL will be created for")
+ description = "The network of the VM the ACL will be created for")
private Long networkId;
@Parameter(name = ApiConstants.ACL_ID,
type = CommandType.UUID,
entityType = NetworkACLResponse.class,
- description = "The network of the vm the ACL will be created for")
+ description = "The network of the VM the ACL will be created for")
private Long aclId;
@Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL,"
- + "can be Ingress or Egress, defaulted to Ingress if not specified")
+ + "can be ingress or egress, defaulted to ingress if not specified")
private String trafficType;
- @Parameter(name = ApiConstants.NUMBER, type = CommandType.INTEGER, description = "The network of the vm the ACL will be created for")
+ @Parameter(name = ApiConstants.NUMBER, type = CommandType.INTEGER, description = "The network of the VM the ACL will be created for")
private Integer number;
@Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, description = "scl entry action, allow or deny")
@@ -239,7 +239,7 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd {
boolean success = false;
NetworkACLItem rule = _networkACLService.getNetworkACLItem(getEntityId());
try {
- CallContext.current().setEventDetails("Rule Id: " + getEntityId());
+ CallContext.current().setEventDetails("Rule ID: " + getEntityId());
success = _networkACLService.applyNetworkACL(rule.getAclId());
// State is different after the rule is applied, so get new object here
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
index 9aa0bab..530dc4e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
@@ -34,7 +34,7 @@ import com.cloud.network.vpc.NetworkACL;
import com.cloud.network.vpc.Vpc;
import com.cloud.user.Account;
-@APICommand(name = "createNetworkACLList", description = "Creates a Network ACL for the given VPC", responseObject = NetworkACLResponse.class,
+@APICommand(name = "createNetworkACLList", description = "Creates a network ACL for the given VPC", responseObject = NetworkACLResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateNetworkACLListCmd extends BaseAsyncCreateCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkACLListCmd.class.getName());
@@ -45,17 +45,17 @@ public class CreateNetworkACLListCmd extends BaseAsyncCreateCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the network ACL List")
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the network ACL list")
private String name;
- @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "Description of the network ACL List")
+ @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "Description of the network ACL list")
private String description;
@Parameter(name = ApiConstants.VPC_ID,
type = CommandType.UUID,
required = true,
entityType = VpcResponse.class,
- description = "Id of the VPC associated with this network ACL List")
+ description = "ID of the VPC associated with this network ACL list")
private Long vpcId;
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the list to the end user or not", since = "4.4", authorized = {RoleType.Admin})
@@ -132,6 +132,6 @@ public class CreateNetworkACLListCmd extends BaseAsyncCreateCmd {
@Override
public String getEventDescription() {
- return "Creating Network ACL with id: " + getEntityUuid();
+ return "Creating Network ACL with ID: " + getEntityUuid();
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
index e030163..1731261 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
@@ -66,24 +66,24 @@ public class CreateNetworkCmd extends BaseCmd {
type = CommandType.UUID,
entityType = NetworkOfferingResponse.class,
required = true,
- description = "the network offering id")
+ description = "the network offering ID")
private Long networkOfferingId;
- @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "the Zone ID for the network")
+ @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "the zone ID for the network")
private Long zoneId;
@Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID,
type = CommandType.UUID,
entityType = PhysicalNetworkResponse.class,
- description = "the Physical Network ID the network belongs to")
+ description = "the physical network ID the network belongs to")
private Long physicalNetworkId;
@Parameter(name = ApiConstants.GATEWAY, type = CommandType.STRING, description = "the gateway of the network. Required "
- + "for Shared networks and Isolated networks when it belongs to VPC")
+ + "for shared networks and isolated networks when it belongs to VPC")
private String gateway;
@Parameter(name = ApiConstants.NETMASK, type = CommandType.STRING, description = "the netmask of the network. Required "
- + "for Shared networks and Isolated networks when it belongs to VPC")
+ + "for shared networks and isolated networks when it belongs to VPC")
private String netmask;
@Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, description = "the beginning IP address in the network IP range")
@@ -93,21 +93,21 @@ public class CreateNetworkCmd extends BaseCmd {
+ " range. If not specified, will be defaulted to startIP")
private String endIp;
- @Parameter(name = ApiConstants.ISOLATED_PVLAN, type = CommandType.STRING, description = "the isolated private vlan for this network")
+ @Parameter(name = ApiConstants.ISOLATED_PVLAN, type = CommandType.STRING, description = "the isolated private VLAN for this network")
private String isolatedPvlan;
@Parameter(name = ApiConstants.NETWORK_DOMAIN, type = CommandType.STRING, description = "network domain")
private String networkDomain;
@Parameter(name = ApiConstants.ACL_TYPE, type = CommandType.STRING, description = "Access control type; supported values"
- + " are account and domain. In 3.0 all shared networks should have aclType=Domain, and all Isolated networks"
- + " - Account. Account means that only the account owner can use the network, domain - all accouns in the domain can use the network")
+ + " are account and domain. In 3.0 all shared networks should have aclType=Domain, and all isolated networks"
+ + " - Account. Account means that only the account owner can use the network, domain - all accounts in the domain can use the network")
private String aclType;
- @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account who will own the network")
+ @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account that will own the network")
private String accountName;
- @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the ssh key")
+ @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the SSH key")
private Long projectId;
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "domain ID of the account owning a network")
@@ -139,7 +139,7 @@ public class CreateNetworkCmd extends BaseCmd {
description = "an optional field, whether to the display the network to the end user or not.", authorized = {RoleType.Admin})
private Boolean displayNetwork;
- @Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, description = "Network ACL Id associated for the network")
+ @Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, description = "Network ACL ID associated for the network")
private Long aclId;
/////////////////////////////////////////////////////
@@ -221,7 +221,7 @@ public class CreateNetworkCmd extends BaseCmd {
Long physicalNetworkId = getPhysicalNetworkId();
if (physicalNetworkId == null && zoneId == null) {
- throw new InvalidParameterValueException("Zone id is required");
+ throw new InvalidParameterValueException("Zone ID is required");
}
return zoneId;
@@ -230,14 +230,14 @@ public class CreateNetworkCmd extends BaseCmd {
public Long getPhysicalNetworkId() {
NetworkOffering offering = _entityMgr.findById(NetworkOffering.class, networkOfferingId);
if (offering == null) {
- throw new InvalidParameterValueException("Unable to find network offering by id " + networkOfferingId);
+ throw new InvalidParameterValueException("Unable to find network offering by ID " + networkOfferingId);
}
if (physicalNetworkId != null) {
if (offering.getGuestType() == GuestType.Shared) {
return physicalNetworkId;
} else {
- throw new InvalidParameterValueException("Physical network id can be specified for networks of guest ip type " + GuestType.Shared + " only.");
+ throw new InvalidParameterValueException("Physical network OD can be specified for networks of guest IP type " + GuestType.Shared + " only.");
}
} else {
if (zoneId == null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
index ecc651d..ab6df80 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
@@ -32,7 +32,7 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "deleteNetworkACL", description = "Deletes a Network ACL", responseObject = SuccessResponse.class,
+@APICommand(name = "deleteNetworkACL", description = "Deletes a network ACL", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkACLCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkACLCmd.class.getName());
@@ -68,7 +68,7 @@ public class DeleteNetworkACLCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return ("Deleting Network ACL id=" + id);
+ return ("Deleting Network ACL ID=" + id);
}
@Override
@@ -79,14 +79,14 @@ public class DeleteNetworkACLCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException {
- CallContext.current().setEventDetails("Network ACL Item Id: " + id);
+ CallContext.current().setEventDetails("Network ACL item ID: " + id);
boolean result = _networkACLService.revokeNetworkACLItem(id);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete network ACL Item");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete network ACL item");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
index 3b3a4ec..19cf601 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
@@ -32,7 +32,7 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "deleteNetworkACLList", description = "Deletes a Network ACL", responseObject = SuccessResponse.class,
+@APICommand(name = "deleteNetworkACLList", description = "Deletes a network ACL", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkACLListCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkACLListCmd.class.getName());
@@ -68,7 +68,7 @@ public class DeleteNetworkACLListCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return ("Deleting Network ACL id=" + id);
+ return ("Deleting network ACL ID=" + id);
}
@Override
@@ -79,7 +79,7 @@ public class DeleteNetworkACLListCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException {
- CallContext.current().setEventDetails("Network ACL Id: " + id);
+ CallContext.current().setEventDetails("Network ACL ID: " + id);
boolean result = _networkACLService.deleteNetworkACL(id);
if (result) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
index 4c3a292..2811434 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
@@ -109,7 +109,7 @@ public class DeleteNetworkCmd extends BaseAsyncCmd {
public long getEntityOwnerId() {
Network network = _networkService.getNetwork(id);
if (network == null) {
- throw new InvalidParameterValueException("Networkd id=" + id + " doesn't exist");
+ throw new InvalidParameterValueException("Network ID=" + id + " doesn't exist");
} else {
return _networkService.getNetwork(id).getAccountId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
index c115fb7..80d616a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
@@ -46,10 +46,10 @@ public class ListNetworkACLListsCmd extends BaseListProjectAndAccountResourcesCm
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, description = "Lists network ACL with the specified ID.")
private Long id;
- @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list network ACLs by network Id")
+ @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list network ACLs by network ID")
private Long networkId;
- @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "list network ACLs by Vpc Id")
+ @Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "list network ACLs by VPC ID")
private Long vpcId;
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "list network ACLs by specified name")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
index 4f9065b..4815bf4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
@@ -47,19 +47,19 @@ public class ListNetworkACLsCmd extends BaseListTaggedResourcesCmd {
description = "Lists network ACL Item with the specified ID")
private Long id;
- @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list network ACL Items by network Id")
+ @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list network ACL items by network ID")
private Long networkId;
- @Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "list network ACL Items by traffic type - Ingress or Egress")
+ @Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "list network ACL items by traffic type - ingress or egress")
private String trafficType;
- @Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, description = "list network ACL Items by ACL Id")
+ @Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, description = "list network ACL items by ACL ID")
private Long aclId;
- @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, description = "list network ACL Items by Protocol")
+ @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, description = "list network ACL items by protocol")
private String protocol;
- @Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, description = "list network ACL Items by Action")
+ @Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, description = "list network ACL items by action")
private String action;
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "list resources by display flag; only ROOT admin is eligible to pass this parameter", since = "4.4", authorized = {RoleType.Admin})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
index 27b3e89..0c57bf9 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
@@ -41,7 +41,7 @@ public class ListNetworkOfferingsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkOfferingResponse.class, description = "list network offerings by id")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkOfferingResponse.class, description = "list network offerings by ID")
private Long id;
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "list network offerings by name")
@@ -59,13 +59,13 @@ public class ListNetworkOfferingsCmd extends BaseListCmd {
@Parameter(name = ApiConstants.SPECIFY_VLAN, type = CommandType.BOOLEAN, description = "the tags for the network offering.")
private Boolean specifyVlan;
- @Parameter(name = ApiConstants.AVAILABILITY, type = CommandType.STRING, description = "the availability of network offering. Default value is Required")
+ @Parameter(name = ApiConstants.AVAILABILITY, type = CommandType.STRING, description = "the availability of network offering. Default value is required")
private String availability;
@Parameter(name = ApiConstants.ZONE_ID,
type = CommandType.UUID,
entityType = ZoneResponse.class,
- description = "list netowrk offerings available for network creation in specific zone")
+ description = "list network offerings available for network creation in specific zone")
private Long zoneId;
@Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "list network offerings by state")
@@ -77,7 +77,7 @@ public class ListNetworkOfferingsCmd extends BaseListCmd {
description = "the ID of the network. Pass this in if you want to see the available network offering that a network can be changed to.")
private Long networkId;
- @Parameter(name = ApiConstants.GUEST_IP_TYPE, type = CommandType.STRING, description = "list network offerings by guest type: Shared or Isolated")
+ @Parameter(name = ApiConstants.GUEST_IP_TYPE, type = CommandType.STRING, description = "list network offerings by guest type: shared or isolated")
private String guestIpType;
@Parameter(name = ApiConstants.SUPPORTED_SERVICES,
@@ -88,7 +88,7 @@ public class ListNetworkOfferingsCmd extends BaseListCmd {
@Parameter(name = ApiConstants.SOURCE_NAT_SUPPORTED,
type = CommandType.BOOLEAN,
- description = "true if need to list only netwok offerings where source nat is supported, false otherwise")
+ description = "true if need to list only netwok offerings where source NAT is supported, false otherwise")
private Boolean sourceNatSupported;
@Parameter(name = ApiConstants.SPECIFY_IP_RANGES,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
index 86f3ba2..041d641 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
@@ -45,19 +45,19 @@ public class ListNetworksCmd extends BaseListTaggedResourcesCmd {
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list networks by id")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkResponse.class, description = "list networks by ID")
private Long id;
- @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the Zone ID of the network")
+ @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the zone ID of the network")
private Long zoneId;
- @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "the type of the network. Supported values are: Isolated and Shared")
+ @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "the type of the network. Supported values are: isolated and shared")
private String guestIpType;
@Parameter(name = ApiConstants.IS_SYSTEM, type = CommandType.BOOLEAN, description = "true if network is system, false otherwise")
private Boolean isSystem;
- @Parameter(name = ApiConstants.ACL_TYPE, type = CommandType.STRING, description = "list networks by ACL (access control list) type. Supported values are Account and Domain")
+ @Parameter(name = ApiConstants.ACL_TYPE, type = CommandType.STRING, description = "list networks by ACL (access control list) type. Supported values are account and domain")
private String aclType;
@Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "type of the traffic")
@@ -72,16 +72,16 @@ public class ListNetworksCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.RESTART_REQUIRED, type = CommandType.BOOLEAN, description = "list networks by restartRequired")
private Boolean restartRequired;
- @Parameter(name = ApiConstants.SPECIFY_IP_RANGES, type = CommandType.BOOLEAN, description = "true if need to list only networks which support specifying ip ranges")
+ @Parameter(name = ApiConstants.SPECIFY_IP_RANGES, type = CommandType.BOOLEAN, description = "true if need to list only networks which support specifying IP ranges")
private Boolean specifyIpRanges;
@Parameter(name = ApiConstants.VPC_ID, type = CommandType.UUID, entityType = VpcResponse.class, description = "List networks by VPC")
private Long vpcId;
- @Parameter(name = ApiConstants.CAN_USE_FOR_DEPLOY, type = CommandType.BOOLEAN, description = "list networks available for vm deployment")
+ @Parameter(name = ApiConstants.CAN_USE_FOR_DEPLOY, type = CommandType.BOOLEAN, description = "list networks available for VM deployment")
private Boolean canUseForDeploy;
- @Parameter(name = ApiConstants.FOR_VPC, type = CommandType.BOOLEAN, description = "the network belongs to vpc")
+ @Parameter(name = ApiConstants.FOR_VPC, type = CommandType.BOOLEAN, description = "the network belongs to VPC")
private Boolean forVpc;
@Parameter(name = ApiConstants.DISPLAY_NETWORK, type = CommandType.BOOLEAN, description = "list resources by display flag; only ROOT admin is eligible to pass this parameter", since = "4.4", authorized = {RoleType.Admin})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
index d005718..fc08753 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/ReplaceNetworkACLListCmd.java
@@ -34,7 +34,7 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@APICommand(name = "replaceNetworkACLList", description = "Replaces ACL associated with a Network or private gateway", responseObject = SuccessResponse.class,
+@APICommand(name = "replaceNetworkACLList", description = "Replaces ACL associated with a network or private gateway", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReplaceNetworkACLListCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(ReplaceNetworkACLListCmd.class.getName());
@@ -84,7 +84,7 @@ public class ReplaceNetworkACLListCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return ("Associating Network ACL id=" + aclId + " with Network id=" + networkId);
+ return ("Associating network ACL ID=" + aclId + " with network ID=" + networkId);
}
@Override
@@ -96,14 +96,14 @@ public class ReplaceNetworkACLListCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException {
if (getNetworkId() == null && getPrivateGatewayId() == null) {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Network id and private gateway can't be null at the same time");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Network ID and private gateway can't be null at the same time");
}
if (getNetworkId() != null && getPrivateGatewayId() != null) {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Network id and private gateway can't be passed at the same time");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Network ID and private gateway can't be passed at the same time");
}
- CallContext.current().setEventDetails("Network ACL Id: " + aclId);
+ CallContext.current().setEventDetails("Network ACL ID: " + aclId);
boolean result = false;
if (getPrivateGatewayId() != null) {
result = _networkACLService.replaceNetworkACLonPrivateGw(aclId, privateGatewayId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
index eba8310..6256665 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
@@ -39,7 +39,7 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network;
@APICommand(name = "restartNetwork",
- description = "Restarts the network; includes 1) restarting network elements - virtual routers, dhcp servers 2) reapplying all public ips 3) reapplying loadBalancing/portForwarding rules",
+ description = "Restarts the network; includes 1) restarting network elements - virtual routers, DHCP servers 2) reapplying all public IPs 3) reapplying loadBalancing/portForwarding rules",
responseObject = IPAddressResponse.class, entityType = {Network.class},
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
@@ -51,7 +51,7 @@ public class RestartNetworkCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
@ACL(accessType = AccessType.OperateEntry)
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkResponse.class, required = true, description = "The id of the network to restart.")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = NetworkResponse.class, required = true, description = "The ID of the network to restart.")
private Long id;
@Parameter(name = ApiConstants.CLEANUP, type = CommandType.BOOLEAN, required = false, description = "If cleanup old network elements")
@@ -64,7 +64,7 @@ public class RestartNetworkCmd extends BaseAsyncCmd {
public Long getNetworkId() {
Network network = _networkService.getNetwork(id);
if (network == null) {
- throw new InvalidParameterValueException("Unable to find network by id " + id);
+ throw new InvalidParameterValueException("Unable to find network by ID " + id);
} else {
return network.getId();
}
@@ -125,7 +125,7 @@ public class RestartNetworkCmd extends BaseAsyncCmd {
public long getEntityOwnerId() {
Network network = _networkService.getNetwork(id);
if (network == null) {
- throw new InvalidParameterValueException("Networkd id=" + id + " doesn't exist");
+ throw new InvalidParameterValueException("Networkd ID=" + id + " doesn't exist");
} else {
return _networkService.getNetwork(id).getAccountId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
index 59ae05d..acc2ae8 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
@@ -34,7 +34,7 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.NetworkACLItem;
import com.cloud.user.Account;
-@APICommand(name = "updateNetworkACLItem", description = "Updates ACL Item with specified Id", responseObject = NetworkACLItemResponse.class,
+@APICommand(name = "updateNetworkACLItem", description = "Updates ACL item with specified ID", responseObject = NetworkACLItemResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkACLItemCmd.class.getName());
@@ -49,7 +49,7 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd {
type = CommandType.UUID,
entityType = NetworkACLItemResponse.class,
required = true,
- description = "the ID of the network ACL Item")
+ description = "the ID of the network ACL item")
private Long id;
@Parameter(name = ApiConstants.PROTOCOL,
@@ -66,10 +66,10 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd {
@Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the cidr list to allow traffic from/to")
private List<String> cidrlist;
- @Parameter(name = ApiConstants.ICMP_TYPE, type = CommandType.INTEGER, description = "type of the icmp message being sent")
+ @Parameter(name = ApiConstants.ICMP_TYPE, type = CommandType.INTEGER, description = "type of the ICMP message being sent")
private Integer icmpType;
- @Parameter(name = ApiConstants.ICMP_CODE, type = CommandType.INTEGER, description = "error code for this icmp message")
+ @Parameter(name = ApiConstants.ICMP_CODE, type = CommandType.INTEGER, description = "error code for this ICMP message")
private Integer icmpCode;
@Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, description = "the traffic type for the ACL,"
@@ -162,7 +162,7 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd {
@Override
public String getEventDescription() {
- return "Updating Network ACL Item";
+ return "Updating network ACL item";
}
public Integer getIcmpCode() {
@@ -180,7 +180,7 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd {
_networkACLService.updateNetworkACLItem(getId(), getProtocol(), getSourceCidrList(), getTrafficType(), getAction(), getNumber(), getSourcePortStart(),
getSourcePortEnd(), getIcmpCode(), getIcmpType(), this.getCustomId(), this.isDisplay());
if (aclItem == null) {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update network ACL Item");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update network ACL item");
}
NetworkACLItemResponse aclResponse = _responseGenerator.createNetworkACLItemResponse(aclItem);
setResponseObject(aclResponse);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
index c58f965..aa1f557 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLListCmd.java
@@ -31,7 +31,7 @@ import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.NetworkACL;
import com.cloud.user.Account;
-@APICommand(name = "updateNetworkACLList", description = "Updates Network ACL list", responseObject = SuccessResponse.class, since = "4.4",
+@APICommand(name = "updateNetworkACLList", description = "Updates network ACL list", responseObject = SuccessResponse.class, since = "4.4",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateNetworkACLListCmd extends BaseAsyncCustomIdCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkACLListCmd.class.getName());
@@ -74,7 +74,7 @@ public class UpdateNetworkACLListCmd extends BaseAsyncCustomIdCmd {
@Override
public String getEventDescription() {
- return ("Updating network acl list id=" + id);
+ return ("Updating network ACL list ID=" + id);
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84266b1c/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
index 0f73dde..921e74b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
@@ -66,13 +66,13 @@ public class UpdateNetworkCmd extends BaseAsyncCustomIdCmd {
@Parameter(name = ApiConstants.NETWORK_DOMAIN, type = CommandType.STRING, description = "network domain")
private String networkDomain;
- @Parameter(name = ApiConstants.CHANGE_CIDR, type = CommandType.BOOLEAN, description = "Force update even if cidr type is different")
+ @Parameter(name = ApiConstants.CHANGE_CIDR, type = CommandType.BOOLEAN, description = "Force update even if CIDR type is different")
private Boolean changeCidr;
@Parameter(name = ApiConstants.NETWORK_OFFERING_ID, type = CommandType.UUID, entityType = NetworkOfferingResponse.class, description = "network offering ID")
private Long networkOfferingId;
- @Parameter(name = ApiConstants.GUEST_VM_CIDR, type = CommandType.STRING, description = "CIDR for Guest VMs,Cloudstack allocates IPs to Guest VMs only from this CIDR")
+ @Parameter(name = ApiConstants.GUEST_VM_CIDR, type = CommandType.STRING, description = "CIDR for guest VMs, CloudStack allocates IPs to guest VMs only from this CIDR")
private String guestVmCidr;
@Parameter(name = ApiConstants.DISPLAY_NETWORK,
@@ -132,7 +132,7 @@ public class UpdateNetworkCmd extends BaseAsyncCustomIdCmd {
public long getEntityOwnerId() {
Network network = _networkService.getNetwork(id);
if (network == null) {
- throw new InvalidParameterValueException("Networkd id=" + id + " doesn't exist");
+ throw new InvalidParameterValueException("Networkd ID=" + id + " doesn't exist");
} else {
return _networkService.getNetwork(id).getAccountId();
}
@@ -144,7 +144,7 @@ public class UpdateNetworkCmd extends BaseAsyncCustomIdCmd {
Account callerAccount = _accountService.getActiveAccountById(callerUser.getAccountId());
Network network = _networkService.getNetwork(id);
if (network == null) {
- throw new InvalidParameterValueException("Couldn't find network by id");
+ throw new InvalidParameterValueException("Couldn't find network by ID");
}
Network result =
@@ -166,16 +166,16 @@ public class UpdateNetworkCmd extends BaseAsyncCustomIdCmd {
if (getNetworkOfferingId() != null) {
Network network = _networkService.getNetwork(getId());
if (network == null) {
- throw new InvalidParameterValueException("Networkd id=" + id + " doesn't exist");
+ throw new InvalidParameterValueException("Networkd ID=" + id + " doesn't exist");
}
if (network.getNetworkOfferingId() != getNetworkOfferingId()) {
NetworkOffering oldOff = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId());
NetworkOffering newOff = _entityMgr.findById(NetworkOffering.class, getNetworkOfferingId());
if (newOff == null) {
- throw new InvalidParameterValueException("Networkd offering id supplied is invalid");
+ throw new InvalidParameterValueException("Networkd offering ID supplied is invalid");
}
- eventMsg.append(". Original network offering id: " + oldOff.getUuid() + ", new network offering id: " + newOff.getUuid());
+ eventMsg.append(". Original network offering ID: " + oldOff.getUuid() + ", new network offering ID: " + newOff.getUuid());
}
}
[04/10] git commit: updated refs/heads/master to 84266b1
Posted by da...@apache.org.
api: iso: fix and reformat descriptions
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1f58c48
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1f58c48
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1f58c48
Branch: refs/heads/master
Commit: a1f58c48ec0b2dd33232c7a0e04af1f99289421e
Parents: 897c738
Author: Rene Moser <re...@apache.org>
Authored: Thu May 21 09:56:13 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:18 2015 +0200
----------------------------------------------------------------------
.../cloudstack/api/command/user/iso/AttachIsoCmd.java | 10 +++++-----
.../cloudstack/api/command/user/iso/CopyIsoCmd.java | 2 +-
.../cloudstack/api/command/user/iso/DeleteIsoCmd.java | 4 ++--
.../cloudstack/api/command/user/iso/DetachIsoCmd.java | 6 +++---
.../cloudstack/api/command/user/iso/ExtractIsoCmd.java | 6 +++---
.../api/command/user/iso/ListIsoPermissionsCmd.java | 2 +-
.../cloudstack/api/command/user/iso/ListIsosCmd.java | 4 ++--
.../cloudstack/api/command/user/iso/RegisterIsoCmd.java | 12 ++++++------
.../cloudstack/api/command/user/iso/UpdateIsoCmd.java | 2 +-
.../api/command/user/iso/UpdateIsoPermissionsCmd.java | 2 +-
10 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f58c48/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
index 1b8087b..c1d67e5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
@@ -78,7 +78,7 @@ public class AttachIsoCmd extends BaseAsyncCmd {
public long getEntityOwnerId() {
UserVm vm = _entityMgr.findById(UserVm.class, getVirtualMachineId());
if (vm == null) {
- throw new InvalidParameterValueException("Unable to find virtual machine by id " + getVirtualMachineId());
+ throw new InvalidParameterValueException("Unable to find virtual machine by ID " + getVirtualMachineId());
}
return vm.getAccountId();
@@ -91,12 +91,12 @@ public class AttachIsoCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return "attaching ISO: " + getId() + " to vm: " + getVirtualMachineId();
+ return "attaching ISO: " + getId() + " to VM: " + getVirtualMachineId();
}
@Override
public void execute() {
- CallContext.current().setEventDetails("Vm Id: " + getVirtualMachineId() + " ISO Id: " + getId());
+ CallContext.current().setEventDetails("Vm Id: " + getVirtualMachineId() + " ISO ID: " + getId());
boolean result = _templateService.attachIso(id, virtualMachineId);
if (result) {
UserVm userVm = _responseGenerator.findUserVmById(virtualMachineId);
@@ -105,10 +105,10 @@ public class AttachIsoCmd extends BaseAsyncCmd {
response.setResponseName(DeployVMCmd.getResultObjectName());
setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to attach iso");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to attach ISO");
}
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to attach iso");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to attach ISO");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f58c48/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
index 9002624..b7c13ce 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/CopyIsoCmd.java
@@ -23,7 +23,7 @@ import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
-@APICommand(name = "copyIso", description = "Copies an iso from one zone to another.", responseObject = TemplateResponse.class, responseView = ResponseView.Restricted,
+@APICommand(name = "copyIso", description = "Copies an ISO from one zone to another.", responseObject = TemplateResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CopyIsoCmd extends CopyTemplateCmd {
public static final Logger s_logger = Logger.getLogger(CopyIsoCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f58c48/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
index 6101e9f..103e922 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
@@ -95,7 +95,7 @@ public class DeleteIsoCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return "Deleting iso " + getId();
+ return "Deleting ISO " + getId();
}
@Override
@@ -116,7 +116,7 @@ public class DeleteIsoCmd extends BaseAsyncCmd {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete iso");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete ISO");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f58c48/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
index 97db2f3..9ee8ef5 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
@@ -70,7 +70,7 @@ public class DetachIsoCmd extends BaseAsyncCmd {
if (vm != null) {
return vm.getAccountId();
} else {
- throw new InvalidParameterValueException("Unable to find vm by id " + getVirtualMachineId());
+ throw new InvalidParameterValueException("Unable to find VM by ID " + getVirtualMachineId());
}
}
@@ -81,7 +81,7 @@ public class DetachIsoCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return "detaching ISO from vm: " + getVirtualMachineId();
+ return "detaching ISO from VM: " + getVirtualMachineId();
}
@Override
@@ -93,7 +93,7 @@ public class DetachIsoCmd extends BaseAsyncCmd {
response.setResponseName(DeployVMCmd.getResultObjectName());
setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to detach iso");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to detach ISO");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f58c48/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
index b78a3d3..85f6008 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
@@ -49,7 +49,7 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TemplateResponse.class, required = true, description = "the ID of the ISO file")
private Long id;
- @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = false, description = "the url to which the ISO would be extracted")
+ @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = false, description = "the URL to which the ISO would be extracted")
private String url;
@Parameter(name = ApiConstants.ZONE_ID,
@@ -109,7 +109,7 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
- return "extracting iso: " + getId() + " from zone: " + getZoneId();
+ return "extracting ISO: " + getId() + " from zone: " + getZoneId();
}
public static String getStaticName() {
@@ -137,7 +137,7 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
response.setObjectName("iso");
this.setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to extract iso");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to extract ISO");
}
} catch (InternalErrorException ex) {
s_logger.warn("Exception: ", ex);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f58c48/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
index f8863d1..9a3db43 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
@@ -26,7 +26,7 @@ import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.template.VirtualMachineTemplate;
-@APICommand(name = "listIsoPermissions", description = "List iso visibility and all accounts that have permissions to view this iso.", responseObject = TemplatePermissionsResponse.class, responseView = ResponseView.Restricted,
+@APICommand(name = "listIsoPermissions", description = "List ISO visibility and all accounts that have permissions to view this ISO.", responseObject = TemplatePermissionsResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
public class ListIsoPermissionsCmd extends BaseListTemplateOrIsoPermissionsCmd {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f58c48/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
index 88e4326..dee60f4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
@@ -49,7 +49,7 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING, description = "the hypervisor for which to restrict the search")
private String hypervisor;
- @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TemplateResponse.class, description = "list ISO by id")
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TemplateResponse.class, description = "list ISO by ID")
private Long id;
@Parameter(name = ApiConstants.IS_PUBLIC, type = CommandType.BOOLEAN, description = "true if the ISO is publicly available to all users, false otherwise.")
@@ -69,7 +69,7 @@ public class ListIsosCmd extends BaseListTaggedResourcesCmd {
+ "* community : templates that have been marked as public but not featured. " + "* all : all templates (only usable by admins).")
private String isoFilter = TemplateFilter.selfexecutable.toString();
- @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "list all isos by name")
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "list all ISOs by name")
private String isoName;
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the ID of the zone")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f58c48/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
index 453b4b6..a1cb478 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
@@ -66,7 +66,7 @@ public class RegisterIsoCmd extends BaseCmd {
description = "true if you want to register the ISO to be publicly available to all users, false otherwise.")
private Boolean publicIso;
- @Parameter(name = ApiConstants.IS_EXTRACTABLE, type = CommandType.BOOLEAN, description = "true if the iso or its derivatives are extractable; default is false")
+ @Parameter(name = ApiConstants.IS_EXTRACTABLE, type = CommandType.BOOLEAN, description = "true if the ISO or its derivatives are extractable; default is false")
private Boolean extractable;
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "the name of the ISO")
@@ -75,7 +75,7 @@ public class RegisterIsoCmd extends BaseCmd {
@Parameter(name = ApiConstants.OS_TYPE_ID,
type = CommandType.UUID,
entityType = GuestOSResponse.class,
- description = "the ID of the OS Type that best represents the OS of this ISO. If the iso is bootable this parameter needs to be passed")
+ description = "the ID of the OS type that best represents the OS of this ISO. If the ISO is bootable this parameter needs to be passed")
private Long osTypeId;
@Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "the URL to where the ISO is currently being hosted")
@@ -97,15 +97,15 @@ public class RegisterIsoCmd extends BaseCmd {
@Parameter(name = ApiConstants.CHECKSUM, type = CommandType.STRING, description = "the MD5 checksum value of this ISO")
private String checksum;
- @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Register iso for the project")
+ @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Register ISO for the project")
private Long projectId;
- @Parameter(name = ApiConstants.IMAGE_STORE_UUID, type = CommandType.STRING, description = "Image store uuid")
+ @Parameter(name = ApiConstants.IMAGE_STORE_UUID, type = CommandType.STRING, description = "Image store UUID")
private String imageStoreUuid;
@Parameter(name = ApiConstants.IS_DYNAMICALLY_SCALABLE,
type = CommandType.BOOLEAN,
- description = "true if iso contains XS/VMWare tools inorder to support dynamic scaling of VM cpu/memory")
+ description = "true if ISO contains XS/VMWare tools inorder to support dynamic scaling of VM CPU/memory")
protected Boolean isDynamicallyScalable;
/////////////////////////////////////////////////////
@@ -197,7 +197,7 @@ public class RegisterIsoCmd extends BaseCmd {
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to register iso");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to register ISO");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f58c48/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
index 5e61160..d072c0a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
@@ -80,7 +80,7 @@ public class UpdateIsoCmd extends BaseUpdateTemplateOrIsoCmd {
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update iso");
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update ISO");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f58c48/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
index b52bc91..dd07faf 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java
@@ -25,7 +25,7 @@ import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-@APICommand(name = "updateIsoPermissions", description = "Updates iso permissions", responseObject = SuccessResponse.class,
+@APICommand(name = "updateIsoPermissions", description = "Updates ISO permissions", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateIsoPermissionsCmd extends BaseUpdateTemplateOrIsoPermissionsCmd {
@Override
[05/10] git commit: updated refs/heads/master to 84266b1
Posted by da...@apache.org.
api: account: fix and reformat descriptions
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68e867f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68e867f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68e867f0
Branch: refs/heads/master
Commit: 68e867f0c6565755f55dea086d21163048d11a9d
Parents: 5cd35a2
Author: Rene Moser <re...@apache.org>
Authored: Thu May 21 09:36:27 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:18 2015 +0200
----------------------------------------------------------------------
.../api/command/user/account/AddAccountToProjectCmd.java | 8 ++++----
.../command/user/account/DeleteAccountFromProjectCmd.java | 6 +++---
.../cloudstack/api/command/user/account/ListAccountsCmd.java | 2 +-
.../api/command/user/account/ListProjectAccountsCmd.java | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68e867f0/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
index ef36038..22deb03 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
@@ -32,7 +32,7 @@ import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
-@APICommand(name = "addAccountToProject", description = "Adds acoount to a project", responseObject = SuccessResponse.class, since = "3.0.0",
+@APICommand(name = "addAccountToProject", description = "Adds account to a project", responseObject = SuccessResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class AddAccountToProjectCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddAccountToProjectCmd.class.getName());
@@ -47,7 +47,7 @@ public class AddAccountToProjectCmd extends BaseAsyncCmd {
type = CommandType.UUID,
entityType = ProjectResponse.class,
required = true,
- description = "id of the project to add the account to")
+ description = "ID of the project to add the account to")
private Long projectId;
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "name of the account to be added to the project")
@@ -87,7 +87,7 @@ public class AddAccountToProjectCmd extends BaseAsyncCmd {
throw new InvalidParameterValueException("Either accountName or email is required");
}
- CallContext.current().setEventDetails("Project id: " + projectId + "; accountName " + accountName);
+ CallContext.current().setEventDetails("Project ID: " + projectId + "; accountName " + accountName);
boolean result = _projectService.addAccountToProject(getProjectId(), getAccountName(), getEmail());
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
@@ -102,7 +102,7 @@ public class AddAccountToProjectCmd extends BaseAsyncCmd {
Project project = _projectService.getProject(getProjectId());
//verify input parameters
if (project == null) {
- InvalidParameterValueException ex = new InvalidParameterValueException("Unable to find project with specified id");
+ InvalidParameterValueException ex = new InvalidParameterValueException("Unable to find project with specified ID");
ex.addProxyObject(getProjectId().toString(), "projectId");
throw ex;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68e867f0/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
index 5c89173..60003b7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
@@ -47,7 +47,7 @@ public class DeleteAccountFromProjectCmd extends BaseAsyncCmd {
type = CommandType.UUID,
entityType = ProjectResponse.class,
required = true,
- description = "id of the project to remove the account from")
+ description = "ID of the project to remove the account from")
private Long projectId;
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "name of the account to be removed from the project")
@@ -76,7 +76,7 @@ public class DeleteAccountFromProjectCmd extends BaseAsyncCmd {
@Override
public void execute() {
- CallContext.current().setEventDetails("Project id: " + projectId + "; accountName " + accountName);
+ CallContext.current().setEventDetails("Project ID: " + projectId + "; accountName " + accountName);
boolean result = _projectService.deleteAccountFromProject(projectId, accountName);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
@@ -91,7 +91,7 @@ public class DeleteAccountFromProjectCmd extends BaseAsyncCmd {
Project project = _projectService.getProject(projectId);
//verify input parameters
if (project == null) {
- throw new InvalidParameterValueException("Unable to find project by id " + projectId);
+ throw new InvalidParameterValueException("Unable to find project by ID " + projectId);
}
return _projectService.getProjectOwner(projectId).getId();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68e867f0/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
index 0b5ae7c..167f233 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
@@ -46,7 +46,7 @@ public class ListAccountsCmd extends BaseListDomainResourcesCmd {
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AccountResponse.class, description = "list account by account ID")
private Long id;
- @Parameter(name = ApiConstants.IS_CLEANUP_REQUIRED, type = CommandType.BOOLEAN, description = "list accounts by cleanuprequred attribute (values are true or false)")
+ @Parameter(name = ApiConstants.IS_CLEANUP_REQUIRED, type = CommandType.BOOLEAN, description = "list accounts by cleanuprequired attribute (values are true or false)")
private Boolean cleanupRequired;
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "list account by account name")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68e867f0/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
index a70024e..3fcb198 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
@@ -39,7 +39,7 @@ public class ListProjectAccountsCmd extends BaseListCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, required = true, description = "id of the project")
+ @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, required = true, description = "ID of the project")
private Long projectId;
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "list accounts of the project by account name")