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:50 UTC
[10/10] git commit: updated refs/heads/master to 84266b1
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());
}
}