You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/01/21 12:18:49 UTC
[38/50] [abbrv] git commit: network-refactor merge: fix nonoss build
network-refactor merge: fix nonoss build
Signed-off-by: Chiradeep Vittal <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ce4b49d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ce4b49d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ce4b49d3
Branch: refs/heads/cloud-agent-with-openvswitch
Commit: ce4b49d30bde910c1ee9dfad077228b0491b32e9
Parents: e45a9f3
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Fri Jan 18 09:37:34 2013 -0800
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Fri Jan 18 09:38:49 2013 -0800
----------------------------------------------------------------------
api/src/com/cloud/network/NetworkModel.java | 2 ++
server/src/com/cloud/network/NetworkModelImpl.java | 6 ++++++
.../com/cloud/network/MockNetworkModelImpl.java | 9 +++++++++
3 files changed, 17 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ce4b49d3/api/src/com/cloud/network/NetworkModel.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/com/cloud/network/NetworkModel.java
index ed76c66..9baa0ec 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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ce4b49d3/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 2470989..a99e9c5 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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ce4b49d3/server/test/com/cloud/network/MockNetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java
index fae5ad3..1771660 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;
+ }
+
}