cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [07/10] git commit: updated refs/heads/master to 84266b1
Date Thu, 21 May 2015 15:49:47 GMT
api: affinitygroup: fix and reformat descriptions

Signed-off-by: Daan Hoogland <daan.hoogland@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 <resmo@apache.org>
Authored: Thu May 21 09:38:12 2015 +0200
Committer: Daan Hoogland <daan.hoogland@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


Mime
View raw message