etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix staticNat after rebase

This commit is contained in:
tuna 2013-11-04 15:53:43 +07:00
parent 4d0602175c
commit 7efab20300
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java
View File

@ -14,7 +14,7 @@ import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value = OvsProviderDao.class)
@DB(txn = false)
@DB()
public class OvsProviderDaoImpl extends GenericDaoBase<OvsProviderVO, Long>
implements OvsProviderDao {
final SearchBuilder<OvsProviderVO> AllFieldsSearch;

4
plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
View File

@ -407,8 +407,8 @@ public class OvsElement extends AdapterBase implements NetworkElement,
throws ResourceUnavailableException {
boolean canHandle = true;
for (Service service : services) {
// check if Ovs can handle services except SourceNat
if (!canHandle(network, service) && service != Service.SourceNat) {
// check if Ovs can handle services except SourceNat & Firewall
if (!canHandle(network, service) && service != Service.SourceNat && service != Service.Firewall) {
canHandle = false;
break;
}