apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-308. ec2-describe-instances - Instance type should return right service offering name

Browse Source
This commit is contained in:
Likitha Shetty 2013-06-24 11:07:19 +05:30
parent f3fa54e732
commit 77674721ca
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
View File

@ -31,6 +31,9 @@ public class CloudStackServiceOfferingVO {
@Column(name="id") @Column(name="id")
private String id; private String id;
@Column(name="uuid")
private String uuid;
@Column(name="name") @Column(name="name")
private String name; private String name;
@ -62,6 +65,8 @@ public class CloudStackServiceOfferingVO {
this.domainId = domainId; this.domainId = domainId;
} }
public String getUuid() {
return uuid;
}
} }

4
awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
View File

@ -58,13 +58,13 @@ public class CloudStackSvcOfferingDaoImpl extends GenericDaoBase<CloudStackServi
@Override @Override
public CloudStackServiceOfferingVO getSvcOfferingById( String id ){ public CloudStackServiceOfferingVO getSvcOfferingById( String id ){
SearchBuilder <CloudStackServiceOfferingVO> searchByID = createSearchBuilder(); SearchBuilder <CloudStackServiceOfferingVO> searchByID = createSearchBuilder();
searchByID.and("id", searchByID.entity().getName(), SearchCriteria.Op.EQ); searchByID.and("uuid", searchByID.entity().getUuid(), SearchCriteria.Op.EQ);
searchByID.done(); searchByID.done();
Transaction txn = Transaction.open(Transaction.CLOUD_DB); Transaction txn = Transaction.open(Transaction.CLOUD_DB);
try { try {
txn.start(); txn.start();
SearchCriteria<CloudStackServiceOfferingVO> sc = searchByID.create(); SearchCriteria<CloudStackServiceOfferingVO> sc = searchByID.create();
sc.setParameters("id", id); sc.setParameters("uuid", id);
return findOneBy(sc); return findOneBy(sc);
}finally { }finally {

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

@ -1772,7 +1772,7 @@ public class EC2Engine extends ManagerBase {
private String serviceOfferingIdToInstanceType( String serviceOfferingId ) throws Exception { private String serviceOfferingIdToInstanceType( String serviceOfferingId ) throws Exception {
try{ try{
CloudStackServiceOfferingVO offering = scvoDao.getSvcOfferingById(serviceOfferingId); //dao.getSvcOfferingById(serviceOfferingId); CloudStackServiceOfferingVO offering = scvoDao.getSvcOfferingById(serviceOfferingId);
if(offering == null){ if(offering == null){
logger.warn( "No instanceType match for serviceOfferingId: [" + serviceOfferingId + "]" ); logger.warn( "No instanceType match for serviceOfferingId: [" + serviceOfferingId + "]" );
return "m1.small"; return "m1.small";