From b2a9b3061d0c1d068573e09ef9fa8c1b4f50f2ba Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Tue, 25 Jan 2011 13:52:49 -0800
Subject: [PATCH] bug 8099: returning systemvms for direct networking status
 8099: resolved fixed

---
 server/src/com/cloud/api/ApiResponseHelper.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 68c0e281fa4..5844d57a716 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -89,6 +89,7 @@ import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.HostPodVO;
 import com.cloud.dc.Pod;
 import com.cloud.dc.Vlan;
+import com.cloud.dc.DataCenter.NetworkType;
 import com.cloud.dc.Vlan.VlanType;
 import com.cloud.dc.VlanVO;
 import com.cloud.domain.Domain;
@@ -1230,7 +1231,11 @@ public class ApiResponseHelper implements ResponseGenerator {
             for (Nic singleNic : nics) {
                Network network = ApiDBUtils.findNetworkById(singleNic.getNetworkId());
                if (network != null) {
-                   if (network.getTrafficType() == TrafficType.Public) {
+                   TrafficType trafficType = TrafficType.Public;
+                   if(zone.getNetworkType() == NetworkType.Basic) {
+                       trafficType = TrafficType.Guest;
+                   }                  
+                   if (network.getTrafficType() == trafficType) {
                        vmResponse.setPublicIp(singleNic.getIp4Address());
                        vmResponse.setPublicMacAddress(singleNic.getMacAddress());
                        vmResponse.setPublicNetmask(singleNic.getNetmask());