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 8F3F910AFD for ; Thu, 27 Jun 2013 23:58:19 +0000 (UTC) Received: (qmail 26905 invoked by uid 500); 27 Jun 2013 23:58:18 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 26889 invoked by uid 500); 27 Jun 2013 23:58:18 -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 26882 invoked by uid 99); 27 Jun 2013 23:58:18 -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, 27 Jun 2013 23:58:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7DBF838DFC; Thu, 27 Jun 2013 23:58:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: prachidamle@apache.org To: commits@cloudstack.apache.org Message-Id: <01c5ca83d5184af1b372a1cda7833bcd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 4858bd1 Date: Thu, 27 Jun 2013 23:58:18 +0000 (UTC) Updated Branches: refs/heads/master f88590f6d -> 4858bd1df CLOUDSTACK-3251 AWSAPI - runInstances should not error out if instanceType provided is a valid ServiceOffering on CloudStack Changes: - If instanceType value corresponds to a valid serviceoffering on CloudStack, dont error out on runInstances even if thats not an AWS name Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4858bd1d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4858bd1d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4858bd1d Branch: refs/heads/master Commit: 4858bd1df37d97732fbd3f13f8ae252582145577 Parents: f88590f Author: Prachi Damle Authored: Thu Jun 27 15:59:26 2013 -0700 Committer: Prachi Damle Committed: Thu Jun 27 15:59:26 2013 -0700 ---------------------------------------------------------------------- awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4858bd1d/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java index 163d9f8..15ed908 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java @@ -1744,16 +1744,8 @@ public class EC2Engine extends ManagerBase { private CloudStackServiceOfferingVO getCSServiceOfferingId(String instanceType) throws Exception { try { - // list of valid values for AWS EC2 instanceType - String[] validInstanceTypes = {"t1.micro", "m1.small", "m1.medium", "m1.large", "m1.xlarge", - "c1.medium", "c1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", - "m3.xlarge", "m3.2xlarge", "hi1.4xlarge", "cc1.4xlarge", "cg1.4xlarge", "cc2.8xlarge"}; - if (instanceType == null) instanceType = "m1.small"; // default value - else if ( !Arrays.asList(validInstanceTypes).contains(instanceType)) { - throw new Exception("Specified instance type is invalid"); - } return scvoDao.getSvcOfferingByName(instanceType); } catch(Exception e) { logger.error( "Error while retrieving ServiceOffering information by name - ", e);