network-refactor merge: fix nonoss build

chiradeep · chiradeep · commit ce4b49d30bde · 2013-01-18T09:38:49.000-08:00
Signed-off-by: Chiradeep Vittal &lt;chiradeep@apache.org&gt;
diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/com/cloud/network/NetworkModel.java
@@ -246,5 +246,7 @@ Map<PublicIpAddress, Set<Service>> getIpToServices(List<? extends PublicIpAddres
     String getDomainNetworkDomain(long domainId, long zoneId);
     
     PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Network guestNetwork);
+    
+    boolean isNetworkInlineMode(Network network);
 
 }
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1830,4 +1830,10 @@ public PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Netwo
         
         return null;
     }
+    
+    public boolean isNetworkInlineMode(Network network) {
+        NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId());
+        return offering.isInline();
+    }
+
 }
diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java
@@ -797,4 +797,13 @@ public PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Netwo
         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;
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -246,5 +246,7 @@ Map<PublicIpAddress, Set<Service>> getIpToServices(List<? extends PublicIpAddres`
`246`	`246`	`String getDomainNetworkDomain(long domainId, long zoneId);`
`247`	`247`
`248`	`248`	`PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Network guestNetwork);`
	`249`	`+`
	`250`	`+ boolean isNetworkInlineMode(Network network);`
`249`	`251`
`250`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1830,4 +1830,10 @@ public PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Netwo`
`1830`	`1830`
`1831`	`1831`	`return null;`
`1832`	`1832`	`}`
	`1833`	`+`
	`1834`	`+ public boolean isNetworkInlineMode(Network network) {`
	`1835`	`+ NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId());`
	`1836`	`+ return offering.isInline();`
	`1837`	`+ }`
	`1838`	`+`
`1833`	`1839`	`}`
Original file line number	Diff line number	Diff line change
`@@ -797,4 +797,13 @@ public PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Netwo`
`797`	`797`	`return null;`
`798`	`798`	`}`
`799`	`799`
	`800`	`+ /* (non-Javadoc)`
	`801`	`+ * @see com.cloud.network.NetworkModel#isNetworkInlineMode(com.cloud.network.Network)`
	`802`	`+ */`
	`803`	`+ @Override`
	`804`	`+ public boolean isNetworkInlineMode(Network network) {`
	`805`	`+ // TODO Auto-generated method stub`
	`806`	`+ return false;`
	`807`	`+ }`
	`808`	`+`
`800`	`809`	`}`