From 983c935f44f682b352b3622d0ba57a72443bc2eb Mon Sep 17 00:00:00 2001
From: Gris Ge <fge@redhat.com>
Date: Thu, 15 Dec 2022 17:16:44 +0800
Subject: [PATCH] Fix regression of VRF interface

Resolves: RHBZ#2134534

Signed-off-by: Gris Ge <fge@redhat.com>
---
 0001-iface-Include-VRF-as-support-type.patch | 38 ++++++++++++++++++++
 nmstate.spec                                 |  6 +++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 0001-iface-Include-VRF-as-support-type.patch

diff --git a/0001-iface-Include-VRF-as-support-type.patch b/0001-iface-Include-VRF-as-support-type.patch
new file mode 100644
index 0000000..2f6c83e
--- /dev/null
+++ b/0001-iface-Include-VRF-as-support-type.patch
@@ -0,0 +1,38 @@
+From b37434e3228b269728e9d7875993417de54d1330 Mon Sep 17 00:00:00 2001
+From: Gris Ge <fge@redhat.com>
+Date: Thu, 15 Dec 2022 17:11:07 +0800
+Subject: [PATCH] iface: Include VRF as support type
+
+We accidentally forgot VRF as supported type.
+The existing VRF test was skipped by CI hence not been found initially.
+
+Manually run the test in RHEL host works well.
+
+Signed-off-by: Gris Ge <fge@redhat.com>
+---
+ rust/src/lib/query_apply/iface.rs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rust/src/lib/query_apply/iface.rs b/rust/src/lib/query_apply/iface.rs
+index a379960b..888bcbb4 100644
+--- a/rust/src/lib/query_apply/iface.rs
++++ b/rust/src/lib/query_apply/iface.rs
+@@ -259,7 +259,7 @@ impl Interface {
+ }
+ 
+ impl InterfaceType {
+-    pub(crate) const SUPPORTED_LIST: [InterfaceType; 13] = [
++    pub(crate) const SUPPORTED_LIST: [InterfaceType; 14] = [
+         InterfaceType::Bond,
+         InterfaceType::LinuxBridge,
+         InterfaceType::Dummy,
+@@ -273,5 +273,6 @@ impl InterfaceType {
+         InterfaceType::Vxlan,
+         InterfaceType::InfiniBand,
+         InterfaceType::Loopback,
++        InterfaceType::Vrf,
+     ];
+ }
+-- 
+2.39.0
+
diff --git a/nmstate.spec b/nmstate.spec
index e3e12d1..384f0b4 100644
--- a/nmstate.spec
+++ b/nmstate.spec
@@ -4,7 +4,7 @@
 
 Name:           nmstate
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Declarative network manager API
 License:        LGPLv2+
 URL:            https://github.com/%{srcname}/%{srcname}
@@ -13,6 +13,7 @@ Source1:        https://github.com/nmstate/nmstate/releases/download/v%{version}
 Source2:        https://nmstate.io/nmstate.gpg
 Source3:        https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-vendor-%{version}.tar.xz
 Patch1:         BZ_2111398-ovs-add-support-for-port-trunks.patch
+Patch2:         0001-iface-Include-VRF-as-support-type.patch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  gnupg2
@@ -151,6 +152,9 @@ popd
 /sbin/ldconfig
 
 %changelog
+* Thu Dec 15 2022 Gris Ge <fge@redhat.com> - 2.2.2-2
+- Fix regression on VRF interface.
+
 * Wed Dec 14 2022 Gris Ge <fge@redhat.com> - 2.2.2-1
 - Upgrade to 2.2.2