openstack/ovn-octavia-provider
Code Issues Proposed changes

Validate ovn_nb/sb_connection in config parser

Browse Source 
... to detect invalid format early and return explicit error to users.

Because these options accept comma-separated strings, use ListOpt to
parse multiple items by the common implementation, instead of building
own regex.

Change-Id: I1546a2826741a0703c0673fcffeddb2356fb10f5
This commit is contained in:
Takashi Kajinami
2025-02-24 23:54:20 +09:00
parent 91b1258eb1
commit 863f52911f
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ovn_octavia_provider/common/config.py
View File

@@ -12,6 +12,7 @@
from keystoneauth1 import loading as ks_loading
from oslo_config import cfg
from oslo_config import types
from oslo_log import log as logging
from ovn_octavia_provider.i18n import _
@@ -20,14 +21,15 @@ LOG = logging.getLogger(__name__)
ovn_opts = [
cfg.StrOpt('ovn_nb_connection',
default='tcp:127.0.0.1:6641',
help=_('The connection string for the OVN_Northbound OVSDB.\n'
'Use tcp:IP:PORT for TCP connection.\n'
'Use ssl:IP:PORT for SSL connection. The '
'ovn_nb_private_key, ovn_nb_certificate and '
'ovn_nb_ca_cert are mandatory.\n'
'Use unix:FILE for unix domain socket connection.')),
cfg.ListOpt('ovn_nb_connection',
default=['tcp:127.0.0.1:6641'],
item_type=types.String(regex=r'^(tcp|ssl|unix):.+'),
help=_('The connection string for the OVN_Northbound OVSDB.\n'
'Use tcp:IP:PORT for TCP connection.\n'
'Use ssl:IP:PORT for SSL connection. The '
'ovn_nb_private_key, ovn_nb_certificate and '
'ovn_nb_ca_cert are mandatory.\n'
'Use unix:FILE for unix domain socket connection.')),
cfg.StrOpt('ovn_nb_private_key',
default='',
help=_('The PEM file with private key for SSL connection to '
@@ -40,14 +42,15 @@ ovn_opts = [
default='',
help=_('The PEM file with CA certificate that OVN should use to'
' verify certificates presented to it by SSL peers')),
cfg.StrOpt('ovn_sb_connection',
default='tcp:127.0.0.1:6642',
help=_('The connection string for the OVN_Southbound OVSDB.\n'
'Use tcp:IP:PORT for TCP connection.\n'
'Use ssl:IP:PORT for SSL connection. The '
'ovn_sb_private_key, ovn_sb_certificate and '
'ovn_sb_ca_cert are mandatory.\n'
'Use unix:FILE for unix domain socket connection.')),
cfg.ListOpt('ovn_sb_connection',
default=['tcp:127.0.0.1:6642'],
item_type=types.String(regex=r'^(tcp|ssl|unix):.+'),
help=_('The connection string for the OVN_Southbound OVSDB.\n'
'Use tcp:IP:PORT for TCP connection.\n'
'Use ssl:IP:PORT for SSL connection. The '
'ovn_sb_private_key, ovn_sb_certificate and '
'ovn_sb_ca_cert are mandatory.\n'
'Use unix:FILE for unix domain socket connection.')),
cfg.StrOpt('ovn_sb_private_key',
default='',
help=_('The PEM file with private key for SSL connection to '
@@ -176,7 +179,7 @@ def list_opts():
def get_ovn_nb_connection():
return cfg.CONF.ovn.ovn_nb_connection
return ','.join(cfg.CONF.ovn.ovn_nb_connection)
def get_ovn_nb_private_key():
@@ -192,7 +195,7 @@ def get_ovn_nb_ca_cert():
def get_ovn_sb_connection():
return cfg.CONF.ovn.ovn_sb_connection
return ','.join(cfg.CONF.ovn.ovn_sb_connection)
def get_ovn_sb_private_key():