cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject git commit: updated refs/heads/4.2 to b0e61f9
Date Tue, 06 Aug 2013 06:31:06 GMT
Updated Branches:
  refs/heads/4.2 3a41c53bd -> b0e61f9d7


CLOUDSTACK-4097 2 optional parameters of addCluster API are not declared correctly

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b0e61f9d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b0e61f9d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b0e61f9d

Branch: refs/heads/4.2
Commit: b0e61f9d79c7d026ae5a944409e9fe1731432bd6
Parents: 3a41c53
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Tue Aug 6 06:30:39 2013 +0530
Committer: Sateesh Chodapuneedi <sateesh@apache.org>
Committed: Tue Aug 6 06:30:39 2013 +0530

----------------------------------------------------------------------
 .../api/command/admin/cluster/AddClusterCmd.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0e61f9d/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
index c8b012a..e8cb10b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
@@ -17,11 +17,9 @@
 
 package org.apache.cloudstack.api.command.admin.cluster;
 
-import com.cloud.exception.DiscoveryException;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.ResourceInUseException;
-import com.cloud.org.Cluster;
-import com.cloud.user.Account;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
@@ -34,8 +32,10 @@ import org.apache.cloudstack.api.response.PodResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.log4j.Logger;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.cloud.exception.DiscoveryException;
+import com.cloud.exception.ResourceInUseException;
+import com.cloud.org.Cluster;
+import com.cloud.user.Account;
 
 @APICommand(name = "addCluster", description="Adds a new cluster", responseObject=ClusterResponse.class)
 public class AddClusterCmd extends BaseCmd {
@@ -87,10 +87,10 @@ public class AddClusterCmd extends BaseCmd {
     @Parameter(name = ApiConstants.VSWITCH_TYPE_PUBLIC_TRAFFIC, type = CommandType.STRING,
required = false, description = "Type of virtual switch used for public traffic in the cluster.
Allowed values are, vmwaresvs (for VMware standard vSwitch) and vmwaredvs (for VMware distributed
vSwitch)")
     private String vSwitchTypePublicTraffic;
 
-    @Parameter(name = ApiConstants.VSWITCH_TYPE_GUEST_TRAFFIC, type = CommandType.STRING,
required = false, description = "Name of virtual switch used for guest traffic in the cluster.
This would override zone wide traffic label setting.")
+    @Parameter(name = ApiConstants.VSWITCH_NAME_GUEST_TRAFFIC, type = CommandType.STRING,
required = false, description = "Name of virtual switch used for guest traffic in the cluster.
This would override zone wide traffic label setting.")
     private String vSwitchNameGuestTraffic;
 
-    @Parameter(name = ApiConstants.VSWITCH_TYPE_PUBLIC_TRAFFIC, type = CommandType.STRING,
required = false, description = "Name of virtual switch used for public traffic in the cluster.
 This would override zone wide traffic label setting.")
+    @Parameter(name = ApiConstants.VSWITCH_NAME_PUBLIC_TRAFFIC, type = CommandType.STRING,
required = false, description = "Name of virtual switch used for public traffic in the cluster.
 This would override zone wide traffic label setting.")
     private String vSwitchNamePublicTraffic;
 
     public String getVSwitchTypeGuestTraffic() {


Mime
View raw message