From ce4b49d30bde910c1ee9dfad077228b0491b32e9 Mon Sep 17 00:00:00 2001 From: Chiradeep Vittal Date: Fri, 18 Jan 2013 09:37:34 -0800 Subject: [PATCH] network-refactor merge: fix nonoss build Signed-off-by: Chiradeep Vittal --- api/src/com/cloud/network/NetworkModel.java | 2 ++ server/src/com/cloud/network/NetworkModelImpl.java | 6 ++++++ server/test/com/cloud/network/MockNetworkModelImpl.java | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/com/cloud/network/NetworkModel.java index ed76c6650ba..9baa0ec435c 100644 --- a/api/src/com/cloud/network/NetworkModel.java +++ b/api/src/com/cloud/network/NetworkModel.java @@ -246,5 +246,7 @@ public interface NetworkModel { String getDomainNetworkDomain(long domainId, long zoneId); PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Network guestNetwork); + + boolean isNetworkInlineMode(Network network); } \ No newline at end of file diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java index 2470989d97d..a99e9c50cbe 100644 --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -1830,4 +1830,10 @@ public class NetworkModelImpl implements NetworkModel, Manager{ return null; } + + public boolean isNetworkInlineMode(Network network) { + NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId()); + return offering.isInline(); + } + } \ No newline at end of file diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java index fae5ad38ffc..1771660f86c 100644 --- a/server/test/com/cloud/network/MockNetworkModelImpl.java +++ b/server/test/com/cloud/network/MockNetworkModelImpl.java @@ -797,4 +797,13 @@ public class MockNetworkModelImpl implements NetworkModel, Manager { return null; } + /* (non-Javadoc) + * @see com.cloud.network.NetworkModel#isNetworkInlineMode(com.cloud.network.Network) + */ + @Override + public boolean isNetworkInlineMode(Network network) { + // TODO Auto-generated method stub + return false; + } + }