summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeifan Fu <weifan.fu@bigswitch.com>2018-10-04 11:56:46 -0700
committerWeifan Fu <weifan.fu@bigswitch.com>2018-10-04 18:28:38 -0700
commit9dc1f823f4c2be41633e421e2aa925b8e08cac42 (patch)
tree9b5844072ae9d19facf5f3b2ee1163129cc69488
parent8032842a1ffdc94ad200497afa3aaa9dd489aecd (diff)
OSP-243: Fix _tag_retriables_as_unretriable Import Errors and skip test_router_add_gateway_notifications
Notes
Notes (review): Code-Review+2: Sarath Kumar Sankaran Kutty <sarath.kutty@bigswitch.com> Workflow+1: Sarath Kumar Sankaran Kutty <sarath.kutty@bigswitch.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 05 Oct 2018 16:03:58 +0000 Reviewed-on: https://review.openstack.org/608058 Project: openstack/networking-bigswitch Branch: refs/heads/master
-rw-r--r--networking_bigswitch/plugins/bigswitch/db/tenant_policy_db.py2
-rw-r--r--networking_bigswitch/tests/unit/ml2/drivers/test_bigswitch_mech.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/networking_bigswitch/plugins/bigswitch/db/tenant_policy_db.py b/networking_bigswitch/plugins/bigswitch/db/tenant_policy_db.py
index 89489d4..effae86 100644
--- a/networking_bigswitch/plugins/bigswitch/db/tenant_policy_db.py
+++ b/networking_bigswitch/plugins/bigswitch/db/tenant_policy_db.py
@@ -16,10 +16,10 @@
16from networking_bigswitch.plugins.bigswitch.i18n import _ 16from networking_bigswitch.plugins.bigswitch.i18n import _
17from networking_bigswitch.plugins.bigswitch.utils import Util 17from networking_bigswitch.plugins.bigswitch.utils import Util
18from neutron.db import api as db 18from neutron.db import api as db
19from neutron.db.api import _tag_retriables_as_unretriable
20from neutron.db import common_db_mixin 19from neutron.db import common_db_mixin
21from neutron.db.models import l3 as l3_models 20from neutron.db.models import l3 as l3_models
22from neutron_lib.api import validators 21from neutron_lib.api import validators
22from neutron_lib.db.api import _tag_retriables_as_unretriable
23from neutron_lib.db import model_base 23from neutron_lib.db import model_base
24from neutron_lib import exceptions as n_exc 24from neutron_lib import exceptions as n_exc
25from oslo_config import cfg 25from oslo_config import cfg
diff --git a/networking_bigswitch/tests/unit/ml2/drivers/test_bigswitch_mech.py b/networking_bigswitch/tests/unit/ml2/drivers/test_bigswitch_mech.py
index 6dfc005..e1cbaf3 100644
--- a/networking_bigswitch/tests/unit/ml2/drivers/test_bigswitch_mech.py
+++ b/networking_bigswitch/tests/unit/ml2/drivers/test_bigswitch_mech.py
@@ -128,6 +128,10 @@ class TestBigSwitchML2Router(test_l3.L3NatTestCaseBase,
128 # TODO(Joe): This test fails. Why? 128 # TODO(Joe): This test fails. Why?
129 pass 129 pass
130 130
131 def test_router_add_gateway_notifications(self):
132 # This creates a gateway port without ip, not supported
133 pass
134
131 def test_router_add_interface_by_port_fails_nested(self): 135 def test_router_add_interface_by_port_fails_nested(self):
132 # Force _validate_router_port_info failure 136 # Force _validate_router_port_info failure
133 plugin = directory.get_plugin(plugin_constants.L3) 137 plugin = directory.get_plugin(plugin_constants.L3)