etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Prachi Damle 2013-06-27 15:59:26 -07:00
parent f88590f6db
commit 4858bd1df3
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
View File

@ -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);