From d9c77e0d169c212751fdf9eccd9a9acae0e1e730 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Fri, 10 Dec 2010 16:32:45 -0800
Subject: [PATCH] bug 7416: return guest/private/public ip/netmask/gateway info
 for the domR instead of returning list of nics status 7416: resolved fixed

---
 server/src/com/cloud/api/ApiResponseHelper.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index d72623006ee..77c63c1df7c 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1071,15 +1071,15 @@ public class ApiResponseHelper implements ResponseGenerator {
            if (network != null) {
                if (network.getTrafficType() == TrafficType.Public) {
                    routerResponse.setPublicIp(singleNic.getIp4Address());
-                   routerResponse.setPublicMacAddress(singleNic.getGateway());
+                   routerResponse.setPublicMacAddress(singleNic.getMacAddress());
                    routerResponse.setPublicNetmask(singleNic.getNetmask());
                } else if (network.getTrafficType() == TrafficType.Control) {
                    routerResponse.setPrivateIp(singleNic.getIp4Address());
-                   routerResponse.setPrivateMacAddress(singleNic.getGateway());
+                   routerResponse.setPrivateMacAddress(singleNic.getMacAddress());
                    routerResponse.setPrivateNetmask(singleNic.getNetmask());
                } else if (network.getTrafficType() == TrafficType.Guest) {
                    routerResponse.setGuestIpAddress(singleNic.getIp4Address());
-                   routerResponse.setGuestIpAddress(singleNic.getGateway());
+                   routerResponse.setGuestMacAddress(singleNic.getMacAddress());
                    routerResponse.setGuestNetmask(singleNic.getNetmask());
                }
            }
@@ -1150,11 +1150,11 @@ public class ApiResponseHelper implements ResponseGenerator {
                if (network != null) {
                    if (network.getTrafficType() == TrafficType.Public) {
                        vmResponse.setPublicIp(singleNic.getIp4Address());
-                       vmResponse.setPublicMacAddress(singleNic.getGateway());
+                       vmResponse.setPublicMacAddress(singleNic.getMacAddress());
                        vmResponse.setPublicNetmask(singleNic.getNetmask());
                    } else if (network.getTrafficType() == TrafficType.Control) {
                        vmResponse.setPrivateIp(singleNic.getIp4Address());
-                       vmResponse.setPrivateMacAddress(singleNic.getGateway());
+                       vmResponse.setPrivateMacAddress(singleNic.getMacAddress());
                        vmResponse.setPrivateNetmask(singleNic.getNetmask());
                    }
                }