Browse Source

Merge "[OVN] Override notify_nova config in neutron-ovn-db-sync-util" into stable/ussuri

changes/48/735948/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
e11d9c773c
3 changed files with 34 additions and 0 deletions
  1. +3
    -0
      neutron/cmd/ovn/neutron_ovn_db_sync_util.py
  2. +0
    -0
      neutron/tests/unit/cmd/ovn/__init__.py
  3. +31
    -0
      neutron/tests/unit/cmd/ovn/test_neutron_ovn_db_sync_util.py

+ 3
- 0
neutron/cmd/ovn/neutron_ovn_db_sync_util.py View File

@@ -135,6 +135,9 @@ def setup_conf():
cfg.CONF.register_cli_opts(ovn_opts, group=ovn_group)
db_group, neutron_db_opts = db_options.list_opts()[0]
cfg.CONF.register_cli_opts(neutron_db_opts, db_group)
# Override Nova notify configuration LP: #1882020
cfg.CONF.set_override('notify_nova_on_port_status_changes', False)
cfg.CONF.set_override('notify_nova_on_port_data_changes', False)
return conf




+ 0
- 0
neutron/tests/unit/cmd/ovn/__init__.py View File


+ 31
- 0
neutron/tests/unit/cmd/ovn/test_neutron_ovn_db_sync_util.py View File

@@ -0,0 +1,31 @@
# Copyright 2020 Canonical Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

from oslo_config import cfg

from neutron.cmd.ovn import neutron_ovn_db_sync_util as util
from neutron.tests import base


class TestNeutronOVNDBSyncUtil(base.BaseTestCase):

def test_setup_conf(self):
# the code under test will fail because of the cfg.conf alredy being
# initialized by the BaseTestCase setUp method. Reset.
cfg.CONF.reset()
util.setup_conf()
# The sync tool will fail if these config options are at their default
# value. Validate that the setup code overrides them. LP: #1882020
self.assertFalse(cfg.CONF.notify_nova_on_port_status_changes)
self.assertFalse(cfg.CONF.notify_nova_on_port_data_changes)

Loading…
Cancel
Save