From addc31d5b1e5d589b5179e9c4ae44405eed65d13 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Mon, 27 Jul 2020 10:47:16 +0000 Subject: [PATCH] Remove "vf_management" and "vf_extended_management" checks Since [1], the SR-IOV commands are executed using Pyroute2. The support to execute those commands is guaranteed by the requested minimum version of this library. [1]https://review.opendev.org/#/c/727811/ Change-Id: I53372524c9cdc75c4b24e1f3c973f8f87a73a8f9 Closes-Bug: #1888920 (cherry picked from commit 6da99368141e9be53be9d013de9180a527bcbd90) --- doc/source/cli/neutron-sanity-check.rst | 16 +--------------- neutron/cmd/sanity_check.py | 4 ---- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/doc/source/cli/neutron-sanity-check.rst b/doc/source/cli/neutron-sanity-check.rst index ebe3beef565..ff420a6980f 100644 --- a/doc/source/cli/neutron-sanity-check.rst +++ b/doc/source/cli/neutron-sanity-check.rst @@ -36,14 +36,12 @@ neutron-sanity-check usage [--noovs_conntrack] [--noovs_geneve] [--noovs_patch] [--noovs_vxlan] [--noovsdb_native] [--noread_netns] [--nouse-syslog] [--nova_notify] - [--noverbose] [--novf_extended_management] - [--novf_management] [--nowatch-log-file] + [--noverbose] [--nowatch-log-file] [--ovs_conntrack] [--ovs_geneve] [--ovs_patch] [--ovs_vxlan] [--ovsdb_native] [--read_netns] [--state_path STATE_PATH] [--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-syslog] [--verbose] [--version] - [--vf_extended_management] [--vf_management] [--watch-log-file] neutron-sanity-check optional arguments @@ -200,12 +198,6 @@ neutron-sanity-check optional arguments ``--noverbose`` The inverse of --verbose -``--novf_extended_management`` - The inverse of --vf_extended_management - -``--novf_management`` - The inverse of --vf_management - ``--nowatch-log-file`` The inverse of --watch-log-file @@ -244,12 +236,6 @@ neutron-sanity-check optional arguments ``--version`` show program's version number and exit -``--vf_extended_management`` - Check for VF extended management support - -``--vf_management`` - Check for VF management support - ``--watch-log-file`` Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log diff --git a/neutron/cmd/sanity_check.py b/neutron/cmd/sanity_check.py index f16e209296d..86888a17187 100644 --- a/neutron/cmd/sanity_check.py +++ b/neutron/cmd/sanity_check.py @@ -357,7 +357,6 @@ def enable_tests_from_config(): run all necessary tests, just by passing in the appropriate configs. """ - cfg.CONF.set_default('vf_management', True) cfg.CONF.set_default('arp_header_match', True) cfg.CONF.set_default('icmpv6_header_match', True) if 'vxlan' in cfg.CONF.AGENT.tunnel_types: @@ -388,9 +387,6 @@ def enable_tests_from_config(): cfg.CONF.set_default('ipset_installed', True) if cfg.CONF.SECURITYGROUP.enable_security_group: cfg.CONF.set_default('ip6tables_installed', True) - if ('sriovnicswitch' in cfg.CONF.ml2.mechanism_drivers and - 'qos' in cfg.CONF.ml2.extension_drivers): - cfg.CONF.set_default('vf_extended_management', True) if cfg.CONF.SECURITYGROUP.firewall_driver in ( 'iptables', 'iptables_hybrid',