openstack/neutron
Code Issues Proposed changes

Merge "Use convert_version_to_tuple() instead of pkg_resources"

Browse Source
This commit is contained in:
Zuul 2024-07-22 19:21:22 +00:00 committed by Gerrit Code Review
commit f6c657624b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/linux/iptables_manager.py
View File

@ -487,7 +487,8 @@ class IptablesManager(object):
privsep_exec=True).split('\n')
def _get_version(self):
# Output example is "iptables v1.6.2"
# Output example is "iptables v1.8.7 (nf_tables)",
# this will return "1.8.7"
args = ['iptables', '--version']
version = str(linux_utils.execute(
args, run_as_root=True, privsep_exec=True).split()[1][1:])

6
neutron/common/utils.py
View File

@ -50,8 +50,8 @@ from oslo_utils import encodeutils
from oslo_utils import excutils
from oslo_utils import timeutils
from oslo_utils import uuidutils
from oslo_utils import versionutils
from osprofiler import profiler
import pkg_resources
from sqlalchemy.dialects.mysql import dialect as mysql_dialect
from sqlalchemy.dialects.postgresql import dialect as postgresql_dialect
from sqlalchemy.dialects.sqlite import dialect as sqlite_dialect
@ -356,8 +356,8 @@ def get_socket_address_family(ip_version):
def is_version_greater_equal(version1, version2):
"""Returns True if version1 is greater or equal than version2 else False"""
return (pkg_resources.parse_version(version1) >=
pkg_resources.parse_version(version2))
return (versionutils.convert_version_to_tuple(version1) >=
versionutils.convert_version_to_tuple(version2))
class DelayedStringRenderer(object):