Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2FEAB10DCD for ; Thu, 21 Nov 2013 22:11:02 +0000 (UTC) Received: (qmail 68572 invoked by uid 500); 21 Nov 2013 22:10:39 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 67906 invoked by uid 500); 21 Nov 2013 22:10:35 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 67216 invoked by uid 99); 21 Nov 2013 22:10:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Nov 2013 22:10:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 56A349010B3; Thu, 21 Nov 2013 22:10:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Thu, 21 Nov 2013 22:11:25 -0000 Message-Id: <8cffa2b3c7404dbdafef72eb1ca357a7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [56/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b Broke up some long strings Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/170f32f1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/170f32f1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/170f32f1 Branch: refs/heads/ui-restyle Commit: 170f32f1714f4e874f5ede92b8b305ffee9ea272 Parents: d620df2 Author: Alex Huang Authored: Thu Nov 21 07:25:01 2013 -0800 Committer: Alex Huang Committed: Thu Nov 21 07:25:01 2013 -0800 ---------------------------------------------------------------------- .../com/cloud/agent/resource/DummyResource.java | 2 +- api/src/com/cloud/agent/api/to/DhcpTO.java | 4 +- .../com/cloud/agent/api/to/LoadBalancerTO.java | 8 +- .../cloud/network/element/NetworkElement.java | 1 - .../com/cloud/network/element/VpcProvider.java | 2 - api/src/com/cloud/server/ManagementService.java | 3 - .../command/admin/vlan/ListVlanIpRangesCmd.java | 5 +- .../api/command/admin/vm/AssignVMCmd.java | 9 +- .../api/response/HostForMigrationResponse.java | 5 +- .../src/com/amazon/s3/client/AmazonS3Stub.java | 719 +++++++++++++------ .../engine/orchestration/CloudOrchestrator.java | 3 +- .../com/cloud/capacity/dao/CapacityDaoImpl.java | 10 +- .../dc/dao/DataCenterIpAddressDaoImpl.java | 4 +- .../cloud/upgrade/dao/Upgrade2213to2214.java | 13 +- .../com/cloud/upgrade/dao/Upgrade2214to30.java | 35 +- .../com/cloud/upgrade/dao/Upgrade302to40.java | 33 +- .../com/cloud/upgrade/dao/Upgrade303to304.java | 33 +- .../com/cloud/upgrade/dao/Upgrade305to306.java | 8 +- .../com/cloud/upgrade/dao/Upgrade40to41.java | 12 +- .../com/cloud/upgrade/dao/Upgrade410to420.java | 8 +- .../com/cloud/upgrade/dao/VersionDaoImpl.java | 4 +- .../src/com/cloud/usage/dao/UsageDaoImpl.java | 6 +- .../com/cloud/usage/dao/UsageVmDiskDaoImpl.java | 8 +- .../src/com/cloud/vm/dao/UserVmDaoImpl.java | 38 +- .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 16 +- pom.xml | 4 +- .../com/cloud/capacity/CapacityManagerImpl.java | 3 +- .../network/firewall/FirewallManagerImpl.java | 23 +- .../com/cloud/vpc/MockNetworkManagerImpl.java | 3 - .../test/regression/PortForwardingTest.java | 15 +- .../hypervisor/vmware/util/VmwareContext.java | 1 - 31 files changed, 675 insertions(+), 363 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/agent/src/com/cloud/agent/resource/DummyResource.java ---------------------------------------------------------------------- diff --git a/agent/src/com/cloud/agent/resource/DummyResource.java b/agent/src/com/cloud/agent/resource/DummyResource.java index ec262a8..816f6ed 100755 --- a/agent/src/com/cloud/agent/resource/DummyResource.java +++ b/agent/src/com/cloud/agent/resource/DummyResource.java @@ -49,7 +49,7 @@ public class DummyResource implements ServerResource { Host.Type _type; boolean _negative; IAgentControl _agentControl; - private Map _params; + Map _params; @Override public void disconnected() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/com/cloud/agent/api/to/DhcpTO.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/to/DhcpTO.java b/api/src/com/cloud/agent/api/to/DhcpTO.java index 56f6b47..50e90ae 100644 --- a/api/src/com/cloud/agent/api/to/DhcpTO.java +++ b/api/src/com/cloud/agent/api/to/DhcpTO.java @@ -22,9 +22,9 @@ public class DhcpTO { String netmask; String startIpOfSubnet; - public DhcpTO(String routerIp, String gateway, String netmask, String StartIpOfSubnet) { + public DhcpTO(String routerIp, String gateway, String netmask, String startIpOfSubnet) { this.routerIp = routerIp; - this.startIpOfSubnet = StartIpOfSubnet; + this.startIpOfSubnet = startIpOfSubnet; this.gateway = gateway; this.netmask = netmask; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/com/cloud/agent/api/to/LoadBalancerTO.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java index aa979e5..baa83df 100644 --- a/api/src/com/cloud/agent/api/to/LoadBalancerTO.java +++ b/api/src/com/cloud/agent/api/to/LoadBalancerTO.java @@ -77,15 +77,15 @@ public class LoadBalancerTO { } public LoadBalancerTO(String id, String srcIp, int srcPort, String protocol, String algorithm, boolean revoked, boolean alreadyAdded, boolean inline, - List arg_destinations, List stickinessPolicies) { + List argDestinations, List stickinessPolicies) { - this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, arg_destinations, stickinessPolicies, null, null, null); + this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, argDestinations, stickinessPolicies, null, null, null); } public LoadBalancerTO(String id, String srcIp, int srcPort, String protocol, String algorithm, boolean revoked, boolean alreadyAdded, boolean inline, - List arg_destinations, List stickinessPolicies, List healthCheckPolicies, LbSslCert sslCert, + List argDestinations, List stickinessPolicies, List healthCheckPolicies, LbSslCert sslCert, String lbProtocol) { - this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, arg_destinations); + this(id, srcIp, srcPort, protocol, algorithm, revoked, alreadyAdded, inline, argDestinations); this.stickinessPolicies = null; this.healthCheckPolicies = null; if (stickinessPolicies != null && stickinessPolicies.size() > 0) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/com/cloud/network/element/NetworkElement.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/element/NetworkElement.java b/api/src/com/cloud/network/element/NetworkElement.java index dda3a14..e7988bf 100644 --- a/api/src/com/cloud/network/element/NetworkElement.java +++ b/api/src/com/cloud/network/element/NetworkElement.java @@ -53,7 +53,6 @@ public interface NetworkElement extends Adapter { * @param config fully specified network configuration. * @param offering network offering that originated the network configuration. * @return true if network configuration is now usable; false if not; null if not handled by this element. - * @throws InsufficientNetworkCapacityException TODO */ boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/com/cloud/network/element/VpcProvider.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/element/VpcProvider.java b/api/src/com/cloud/network/element/VpcProvider.java index 5165481..14e8619 100644 --- a/api/src/com/cloud/network/element/VpcProvider.java +++ b/api/src/com/cloud/network/element/VpcProvider.java @@ -21,7 +21,6 @@ import java.util.List; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InsufficientNetworkCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.vpc.NetworkACLItem; import com.cloud.network.vpc.PrivateGateway; @@ -33,7 +32,6 @@ public interface VpcProvider extends NetworkElement { /** * Start vpc element as specified * @param vpc fully specified vpc configuration. - * @throws InsufficientNetworkCapacityException TODO */ boolean implementVpc(Vpc vpc, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/com/cloud/server/ManagementService.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index ce62326..24fad87 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd; import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd; import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd; @@ -250,8 +249,6 @@ public interface ManagementService { * @param cmd * -- upload certificate cmd * @return -- returns a string on success - * @throws ServerApiException - * -- even if one of the console proxy patching fails, we throw back this exception */ String uploadCertificate(UploadCustomCertificateCmd cmd); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java index f629af8..9d6eae6 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java @@ -58,7 +58,8 @@ public class ListVlanIpRangesCmd extends BaseListCmd { @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, - description = "the domain ID with which the VLAN IP range is associated. If used with the account parameter, returns all VLAN IP ranges for that account in the specified domain.") + description = "the domain ID with which the VLAN IP range is associated. If used with the account parameter, " + + "returns all VLAN IP ranges for that account in the specified domain.") private Long domainId; @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = VlanIpRangeResponse.class, required = false, description = "the ID of the VLAN IP range") @@ -151,6 +152,6 @@ public class ListVlanIpRangesCmd extends BaseListCmd { response.setResponses(vlanResponses, vlans.second()); response.setResponseName(getCommandName()); - this.setResponseObject(response); + setResponseObject(response); } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java index e85c288..c9b5c9f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java @@ -65,14 +65,17 @@ public class AssignVMCmd extends BaseCmd { type = CommandType.LIST, collectionType = CommandType.UUID, entityType = NetworkResponse.class, - description = "list of new network ids in which the moved VM will participate. In case no network ids are provided the VM will be part of the default network for that zone. In case there is no network yet created for the new account the default network will be created.") + description = "list of new network ids in which the moved VM will participate. In case no network ids are provided the VM will be part of the default network for that zone. " + + + "In case there is no network yet created for the new account the default network will be created.") private List networkIds; @Parameter(name = ApiConstants.SECURITY_GROUP_IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = SecurityGroupResponse.class, - description = "list of security group ids to be applied on the virtual machine. In case no security groups are provided the VM is part of the default security group.") + description = "list of security group ids to be applied on the virtual machine. " + + "In case no security groups are provided the VM is part of the default security group.") private List securityGroupIdList; ///////////////////////////////////////////////////// @@ -117,7 +120,7 @@ public class AssignVMCmd extends BaseCmd { } UserVmResponse response = _responseGenerator.createUserVmResponse("virtualmachine", userVm).get(0); response.setResponseName(getCommandName()); - this.setResponseObject(response); + setResponseObject(response); } catch (Exception e) { e.printStackTrace(); throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm " + e.getMessage()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java index 6e2e745..2f3c86b 100644 --- a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java +++ b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java @@ -188,7 +188,8 @@ public class HostForMigrationResponse extends BaseResponse { private Boolean hasEnoughCapacity; @SerializedName("suitableformigration") - @Param(description = "true if this host is suitable(has enough capacity and satisfies all conditions like hosttags, max guests vm limit etc) to migrate a VM to it , false otherwise") + @Param(description = "true if this host is suitable(has enough capacity and satisfies all conditions like hosttags, " + + "max guests vm limit etc) to migrate a VM to it , false otherwise") private Boolean suitableForMigration; @SerializedName("requiresStorageMotion") @@ -209,7 +210,7 @@ public class HostForMigrationResponse extends BaseResponse { @Override public String getObjectId() { - return this.getId(); + return getId(); } public String getId() {