apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

network-refactor merge: fix nonoss build

Browse Source 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
This commit is contained in:
Chiradeep Vittal 2013-01-18 09:37:34 -08:00
parent e45a9f3aed
commit ce4b49d30b
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/network/NetworkModel.java
View File

@ -246,5 +246,7 @@ public interface NetworkModel {
String getDomainNetworkDomain(long domainId, long zoneId); String getDomainNetworkDomain(long domainId, long zoneId);
PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Network guestNetwork); PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Network guestNetwork);
boolean isNetworkInlineMode(Network network);
} }

6
server/src/com/cloud/network/NetworkModelImpl.java
View File

@ -1830,4 +1830,10 @@ public class NetworkModelImpl implements NetworkModel, Manager{
return null; return null;
} }
public boolean isNetworkInlineMode(Network network) {
NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId());
return offering.isInline();
}
} }

9
server/test/com/cloud/network/MockNetworkModelImpl.java
View File

@ -797,4 +797,13 @@ public class MockNetworkModelImpl implements NetworkModel, Manager {
return null; 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;
}
} }