From 77674721cacba4bdf446c048118f10c474c92f03 Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Mon, 24 Jun 2013 11:07:19 +0530
Subject: [PATCH] CLOUDSTACK-308. ec2-describe-instances - Instance type should
 return right service offering name

---
 .../cloud/bridge/model/CloudStackServiceOfferingVO.java  | 9 +++++++--
 .../bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java | 4 ++--
 .../src/com/cloud/bridge/service/core/ec2/EC2Engine.java | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
index de2941e23db..f63301a437a 100644
--- a/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
+++ b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
@@ -30,7 +30,10 @@ public class CloudStackServiceOfferingVO {
     @Id
     @Column(name="id")
     private String id;
-    
+
+    @Column(name="uuid")
+    private String uuid;
+
     @Column(name="name")
     private String name;
     
@@ -61,7 +64,9 @@ public class CloudStackServiceOfferingVO {
     public void setDomainId(String domainId) {
         this.domainId = domainId;
     }
-    
 
+    public String getUuid() {
+        return uuid;
+    }
 
 }
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
index 8cca13eb1df..f0d05d3490b 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
@@ -58,13 +58,13 @@ public class CloudStackSvcOfferingDaoImpl extends GenericDaoBase<CloudStackServi
 	@Override
     public CloudStackServiceOfferingVO getSvcOfferingById( String id ){
         SearchBuilder <CloudStackServiceOfferingVO> searchByID = createSearchBuilder();
-        searchByID.and("id", searchByID.entity().getName(), SearchCriteria.Op.EQ);
+        searchByID.and("uuid", searchByID.entity().getUuid(), SearchCriteria.Op.EQ);
         searchByID.done();
         Transaction txn = Transaction.open(Transaction.CLOUD_DB);
         try {
             txn.start();
             SearchCriteria<CloudStackServiceOfferingVO> sc = searchByID.create();
-            sc.setParameters("id", id);
+            sc.setParameters("uuid", id);
             return findOneBy(sc);
         
         }finally {
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 1859bb807e4..f24bfedf42c 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -1772,7 +1772,7 @@ public class EC2Engine extends ManagerBase {
     private String serviceOfferingIdToInstanceType( String serviceOfferingId ) throws Exception {
         try{
 
-            CloudStackServiceOfferingVO offering =  scvoDao.getSvcOfferingById(serviceOfferingId); //dao.getSvcOfferingById(serviceOfferingId);
+            CloudStackServiceOfferingVO offering =  scvoDao.getSvcOfferingById(serviceOfferingId);
             if(offering == null){
                 logger.warn( "No instanceType match for serviceOfferingId: [" + serviceOfferingId + "]" );
                 return "m1.small";