Merge "[OVN] ovsdbapp `chassis_del
removes
Chassis_Private
` too"
This commit is contained in:
@@ -29,7 +29,6 @@ from oslo_config import cfg
|
||||
from oslo_log import log
|
||||
from oslo_utils import timeutils
|
||||
from oslo_utils import uuidutils
|
||||
from ovsdbapp.backend.ovs_idl import idlutils
|
||||
|
||||
from neutron.agent.linux import utils
|
||||
from neutron.api import extensions as exts
|
||||
@@ -468,12 +467,3 @@ class TestOVNFunctionalBase(test_plugin.Ml2PluginV2TestCase,
|
||||
def del_fake_chassis(self, chassis, if_exists=True):
|
||||
self.sb_api.chassis_del(
|
||||
chassis, if_exists=if_exists).execute(check_error=True)
|
||||
try:
|
||||
self.sb_api.db_destroy(
|
||||
'Chassis_Private', chassis).execute(check_error=True)
|
||||
except idlutils.RowNotFound:
|
||||
# NOTE(ykarel ): ovsdbapp >= 2.7.0 handles Chassis_Private
|
||||
# record delete with chassis
|
||||
# try/except can be dropped when neutron requirements.txt
|
||||
# include ovsdbapp>=2.7.0
|
||||
pass
|
||||
|
Reference in New Issue
Block a user