Updated Branches: refs/heads/master 691be5c60 -> f8bd05a1e
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 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f8bd05a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f8bd05a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f8bd05a1 Branch: refs/heads/master Commit: f8bd05a1e346c38136a65277524f715fccd1d75b Parents: 691be5c Author: Alena Prokharchyk <[email protected]> Authored: Thu Aug 16 15:45:39 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Fri Aug 17 09:43:34 2012 -0700 ---------------------------------------------------------------------- .../com/cloud/network/guru/GuestNetworkGuru.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f8bd05a1/server/src/com/cloud/network/guru/GuestNetworkGuru.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java index 9bfcfb1..cebfb08 100755 --- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java @@ -373,11 +373,11 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur 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; } }
