From 01f33deca0724fa6ad1024743a974512a92629be Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Thu, 16 Aug 2012 15:45:39 -0700
Subject: [PATCH] Fixed regression in GuestNetworkGuru - get networkId from the
 network object passed to the method call instead of retrieving it from tne
 NicProfile when it wasn't set yet

---
 server/src/com/cloud/network/guru/GuestNetworkGuru.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java
index c47269da8fe..c33dfbbc869 100755
--- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java
@@ -330,11 +330,11 @@ public class GuestNetworkGuru extends AdapterBase implements NetworkGuru {
                 boolean isGateway = false;
                 if (vm.getVirtualMachine().getType() == VirtualMachine.Type.DomainRouter) {
                     if (network.getVpcId() != null) {
-                        if (_networkMgr.isProviderSupportServiceInNetwork(nic.getNetworkId(), Service.SourceNat, Provider.VPCVirtualRouter)) {
+                        if (_networkMgr.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, Provider.VPCVirtualRouter)) {
                             isGateway = true;
                         }
                     } else {
-                        if (_networkMgr.isProviderSupportServiceInNetwork(nic.getNetworkId(), Service.SourceNat, Provider.VirtualRouter)) {
+                        if (_networkMgr.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, Provider.VirtualRouter)) {
                             isGateway = true;
                         }
                     }