From 02075c3a2deebb5e1af61c9831400d4bbe36e636 Mon Sep 17 00:00:00 2001
From: frank <frank.zhang@citrix.com>
Date: Tue, 7 Feb 2012 10:57:57 -0800
Subject: [PATCH] Bug 13476 - Public IP's are not shown in the UI for the
 System VMs

status 13476: resolved fixed
---
 server/src/com/cloud/api/ApiResponseHelper.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 04b9d0cac02..502a0247568 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1610,8 +1610,9 @@ public class ApiResponseHelper implements ResponseGenerator {
                     } else if (network.getTrafficType() == TrafficType.Control) {
                         vmResponse.setLinkLocalIp(singleNicProfile.getIp4Address());
                         vmResponse.setLinkLocalMacAddress(singleNicProfile.getMacAddress());
-                        vmResponse.setLinkLocalNetmask(singleNicProfile.getNetmask());
-                    } else if (network.getTrafficType() == TrafficType.Public) {
+                        vmResponse.setLinkLocalNetmask(singleNicProfile.getNetmask());
+                    } else if (network.getTrafficType() == TrafficType.Public || network.getTrafficType() == TrafficType.Guest) {
+                    	/*In basic zone, public ip has TrafficType.Guest*/
                         vmResponse.setPublicIp(singleNicProfile.getIp4Address());
                         vmResponse.setPublicMacAddress(singleNicProfile.getMacAddress());
                         vmResponse.setPublicNetmask(singleNicProfile.getNetmask());