From 2902f3d8bddc202e1de8ae36d7c08af253b16aa1 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Tue, 6 Dec 2011 16:51:13 -0800
Subject: [PATCH] Update service offering id in the
 NetworkServiceOfferingResponse

---
 server/src/com/cloud/api/ApiDBUtils.java        | 6 ++++++
 server/src/com/cloud/api/ApiResponseHelper.java | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index 79e7edad87a..99bb299b8f2 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -81,6 +81,7 @@ import com.cloud.resource.ResourceManager;
 import com.cloud.server.Criteria;
 import com.cloud.server.ManagementServer;
 import com.cloud.server.StatsCollector;
+import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.GuestOS;
@@ -723,4 +724,9 @@ public class ApiDBUtils {
     public static long countFreePublicIps() {
     	return _ipAddressDao.countFreeIPs();
     }
+    
+    public static long findDefaultRouterServiceOffering() {
+        ServiceOfferingVO serviceOffering = _serviceOfferingDao.findByName("Cloud.Com-SoftwareRouter");
+        return serviceOffering.getId();
+    }
 }
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index dcf7b9d0752..5d079134119 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2572,8 +2572,12 @@ public class ApiResponseHelper implements ResponseGenerator {
         response.setIsDefault(offering.isDefault());
         response.setSpecifyVlan(offering.getSpecifyVlan());
         response.setAvailability(offering.getAvailability().toString());
-        response.setNetworkRate(ApiDBUtils.getNetworkRate(offering.getId()));
-        response.setServiceOfferingId(offering.getServiceOfferingId());
+        response.setNetworkRate(ApiDBUtils.getNetworkRate(offering.getId()));
+        if (offering.getServiceOfferingId() != null) {
+            response.setServiceOfferingId(offering.getServiceOfferingId());
+        } else {
+            response.setServiceOfferingId(ApiDBUtils.findDefaultRouterServiceOffering());
+        }
         if (offering.getGuestType() != null) {
             response.setGuestIpType(offering.getGuestType().toString());
         }