Fix regression of VRF interface

Resolves: RHBZ#2134534

Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
Gris Ge 2022-12-15 17:16:44 +08:00
parent 6b175c0bdf
commit 983c935f44
2 changed files with 43 additions and 1 deletions

View File

@ -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

View File

@ -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