openstack/neutron
Code Issues Proposed changes

`_get_ovn_version` returns a 3 element tuple

Browse Source 
The output of this method should be compared to a 3 element
tuple.

This patch changes the minimum versions of the supported
features to have 3 elements too. This are the version changes
and their justifications:
* OVN_NB_DB_SCHEMA_GATEWAY_CHASSIS = '5.7.0'
  Version reported in LP#2008077
* OVN_NB_DB_SCHEMA_PORT_GROUP = '5.11.0'
  Version reported in LP#1946023
* OVN_NB_DB_SCHEMA_STATELESS_NAT = '5.17.0'
  Version reported in LP#1949494
* OVN_SB_DB_SCHEMA_VIRTUAL_PORT = '2.5.0'
  Version reported in LP#1949496
* OVN_LOCALNET_LEARN_FDB = '22.09.0'
  Version reported in LP#1946023. In fact, the version
  supporting this feature is older.

Closes-Bug: #2017878
Change-Id: Idc19b30e2453b4d68473b488dba226dc48be9efe
This commit is contained in:
Rodolfo Alonso Hernandez 2023-04-23 13:13:52 +02:00
parent 5c45b1ee29
commit a9963e90d9
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
neutron/cmd/sanity/checks.py
View File

@ -49,11 +49,11 @@ DNSMASQ_VERSION_HOST_ADDR6_LIST = '2.81'
DIRECT_PORT_QOS_MIN_OVS_VERSION = '2.11'
MINIMUM_DIBBLER_VERSION = '1.0.1'
CONNTRACK_GRE_MODULE = 'nf_conntrack_proto_gre'
OVN_NB_DB_SCHEMA_GATEWAY_CHASSIS = '5.7'
OVN_NB_DB_SCHEMA_PORT_GROUP = '5.11'
OVN_NB_DB_SCHEMA_STATELESS_NAT = '5.17'
OVN_SB_DB_SCHEMA_VIRTUAL_PORT = '2.5'
OVN_LOCALNET_LEARN_FDB = '22.09'
OVN_NB_DB_SCHEMA_GATEWAY_CHASSIS = '5.7.0'
OVN_NB_DB_SCHEMA_PORT_GROUP = '5.11.0'
OVN_NB_DB_SCHEMA_STATELESS_NAT = '5.17.0'
OVN_SB_DB_SCHEMA_VIRTUAL_PORT = '2.5.0'
OVN_LOCALNET_LEARN_FDB = '22.09.0'
class OVNCheckType(enum.Enum):
@ -64,6 +64,14 @@ class OVNCheckType(enum.Enum):
def _get_ovn_version(check_type):
"""Retrieves the OVN nbctl, sbctl, NS schema or SB schema version
:param check_type: ``OVNCheckType`` enum element. This method can return
the nbctl version, the sbctl version, the NB schema
version or the SB schema version.
:return: (tuple) 3 element tuple: (major, minor, revision). (0, 0, 0) by
default.
"""
if check_type in (OVNCheckType.nb_version, OVNCheckType.nb_db_schema):
cmd = ['ovn-nbctl', '--version']
elif check_type in (OVNCheckType.nb_version, OVNCheckType.nb_db_schema):
@ -79,9 +87,9 @@ def _get_ovn_version(check_type):
else:
matched_line = re.search(r"DB Schema.*", out)
matched_version = re.search(r"(\d+\.\d+)", matched_line.group(0))
matched_version = re.search(r"(\d+\.\d+\.\d+)", matched_line.group(0))
return versionutils.convert_version_to_tuple(matched_version.group(1) if
matched_version else '0.0')
matched_version else '0.0.0')
def ovs_vxlan_supported(from_ip='192.0.2.1', to_ip='192.0.2.2'):