import nmstate-1.2.1-4.el8_6

SOURCES/BZ_2108632-sriov-Only-verify-SRIOV-VF-when-desired.patch

@@ -0,0 +1,31 @@
+From e1297610307287960290b9a8e87c75acf2b74e6a Mon Sep 17 00:00:00 2001
+From: Gris Ge <fge@redhat.com>
+Date: Sun, 3 Jul 2022 17:06:12 +0800
+Subject: [PATCH] sriov: Only verify SRIOV VF when desired
+
+Skip the verification on SR-IOV if desire state does not mentioned so.
+
+Unit test case included.
+
+Signed-off-by: Gris Ge <fge@redhat.com>
+---
+ libnmstate/ifaces/ethernet.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libnmstate/ifaces/ethernet.py b/libnmstate/ifaces/ethernet.py
+index 720deab7..f3a843c0 100644
+--- a/libnmstate/ifaces/ethernet.py
++++ b/libnmstate/ifaces/ethernet.py
+@@ -152,6 +152,9 @@ def verify_sriov_vf(iface, cur_ifaces):
+         and (iface.is_desired or iface.is_changed)
+         and iface.type == InterfaceType.ETHERNET
+         and iface.sriov_total_vfs > 0
++        and iface.original_desire_dict.get(Ethernet.CONFIG_SUBTREE, {}).get(
++            Ethernet.SRIOV_SUBTREE
++        )
+     ):
+         return
+     cur_iface = cur_ifaces.get_iface(iface.name, iface.type)
+-- 
+2.31.1
+

SPECS/nmstate.spec

@@ -4,7 +4,7 @@
 
 Name:           nmstate
 Version:        1.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Declarative network manager API
 License:        LGPLv2+
 URL:            https://github.com/%{srcname}/%{srcname}
@@ -13,8 +13,9 @@ Source1:        %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.g
 Source2:        https://www.nmstate.io/nmstate.gpg
 Source3:        nmstate-rust-vendor-%{version}.tar.xz
 Patch0:         BZ_2080530-python-bridge-clear-vlan-filtering-when-set-empty.patch
-Patch1:		BZ_2080528-ovs-Do-not-validate-on-non-desired-interface.patch
+Patch1:         BZ_2080528-ovs-Do-not-validate-on-non-desired-interface.patch
 Patch2:         BZ_2088373-nm-bridge-Fix-multicast_router-option.patch
+Patch3:         BZ_2108632-sriov-Only-verify-SRIOV-VF-when-desired.patch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  gnupg2
@@ -146,6 +147,9 @@ popd
 /sbin/ldconfig
 
 %changelog
+* Thu Jul 14 2022 Gris Ge <fge@redhat.com> - 1.2.1-4
+- Skip verification on SRIOV if not desired. RHBZ#2108632
+
 * Tue May 24 2022 Fernando Fernandez Mancera - 1.2.1-3
 - Fix disable multicast-router for linux bridge. RHBZ#2088373