From 7efab20300eec38d391f1a3135c0c50dcd035dc8 Mon Sep 17 00:00:00 2001 From: tuna Date: Mon, 4 Nov 2013 15:53:43 +0700 Subject: [PATCH] fix staticNat after rebase --- .../schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java | 2 +- .../ovs/src/com/cloud/network/element/OvsElement.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java b/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java index b00d5c1e895..2026ccf2a7e 100644 --- a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java @@ -14,7 +14,7 @@ import com.cloud.utils.db.SearchCriteria; @Component @Local(value = OvsProviderDao.class) -@DB(txn = false) +@DB() public class OvsProviderDaoImpl extends GenericDaoBase implements OvsProviderDao { final SearchBuilder AllFieldsSearch; diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java index 2b625a9a3b0..2641d5488e9 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java @@ -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; }