import nmstate-2.2.7-1.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
849379d059
commit
243683f975
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1,3 @@
|
||||
SOURCES/nmstate-2.1.4.tar.gz
|
||||
SOURCES/nmstate-vendor-2.1.4.tar.xz
|
||||
SOURCES/nmstate-2.2.7.tar.gz
|
||||
SOURCES/nmstate-vendor-2.2.7.tar.xz
|
||||
SOURCES/nmstate.gpg
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
a35f8ea70135883db792e42d8137dd70f4c38699 SOURCES/nmstate-2.1.4.tar.gz
|
||||
bab6a2cf4190bba15bce5818836c4679d8409e14 SOURCES/nmstate-vendor-2.1.4.tar.xz
|
||||
81e7b247cdbce99278f10da00b36865512c07672 SOURCES/nmstate-2.2.7.tar.gz
|
||||
c0ca6dae9ed0042aa2da5bb3a048677391370bb5 SOURCES/nmstate-vendor-2.2.7.tar.xz
|
||||
5c1d9d65f9db4fedc9dc96e0fb6cac0a86749c88 SOURCES/nmstate.gpg
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
From d10202dee84756acff0be7144bbf0dd3f415f57a Mon Sep 17 00:00:00 2001
|
||||
From: Gris Ge <fge@redhat.com>
|
||||
Date: Tue, 30 Aug 2022 22:54:44 +0800
|
||||
Subject: [PATCH] nm: Fix moving bridge port to bond
|
||||
|
||||
When moving bridge port with VLAN filtering setting to bond, we got
|
||||
failure:
|
||||
A connection with a 'bridge-port' setting must have the slave-type
|
||||
set to 'bridge'. Instead it is 'bond'
|
||||
|
||||
The root cause is we forgot to remove `NmSettingBridgePort` when
|
||||
detaching port away from bridge.
|
||||
|
||||
The fix is remove `NmSettingBridgePort` and
|
||||
`NmSettingOvsBridgeInterface` if not bridge port or OVS interface
|
||||
anymore.
|
||||
|
||||
Integration test cases for linux bridge and OVS bridge are included.
|
||||
|
||||
Signed-off-by: Gris Ge <fge@redhat.com>
|
||||
(cherry picked from commit d2c40c3aade1d7764b84f0aafe8d3d907bb1c4a6)
|
||||
---
|
||||
rust/src/lib/nm/connection.rs | 8 ++++++++
|
||||
tests/integration/linux_bridge_test.py | 15 ++++++++++++++-
|
||||
tests/integration/ovs_test.py | 20 +++++++++++++++++++-
|
||||
3 files changed, 41 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/rust/src/lib/nm/connection.rs b/rust/src/lib/nm/connection.rs
|
||||
index 7fbf2631..91bd9077 100644
|
||||
--- a/rust/src/lib/nm/connection.rs
|
||||
+++ b/rust/src/lib/nm/connection.rs
|
||||
@@ -279,6 +279,14 @@ pub(crate) fn iface_to_nm_connections(
|
||||
_ => (),
|
||||
};
|
||||
|
||||
+ if nm_conn.controller_type() != Some(NM_SETTING_BRIDGE_SETTING_NAME) {
|
||||
+ nm_conn.bridge_port = None;
|
||||
+ }
|
||||
+
|
||||
+ if nm_conn.controller_type() != Some(NM_SETTING_OVS_PORT_SETTING_NAME) {
|
||||
+ nm_conn.ovs_iface = None;
|
||||
+ }
|
||||
+
|
||||
if let Some(Interface::LinuxBridge(br_iface)) = ctrl_iface {
|
||||
gen_nm_br_port_setting(br_iface, &mut nm_conn);
|
||||
}
|
||||
--
|
||||
2.38.1
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEfUQ+BAINyWGvqJXerIciWuEsPqMFAmL1HPsACgkQrIciWuEs
|
||||
PqMATQ/7BNE44Uy4/TU5d3I3CIGADWxWtoAT+xeTydDi2ohRKI23nKLzVvBgUXXu
|
||||
thnn8trzGv8i4dKmFif2ZmM83Tgo8chYmpHuDkT7x/W21/BAaz9+CpX/O+vdibV3
|
||||
BdGCqDiAJ2zOrVsYHooMplgydUumlkBxHwm8suOHm3fMROPLRsIZD7643PGXKHtY
|
||||
+u1moRTwwIVRrgLLu6wCYjNaXv96qycusrKRnVhN2EQ4Kg1W/aoWbVUJiOCHKr83
|
||||
KSa67yWJkA1w/xuSxXOuC9Ci1PZ42x25B56VyHazoHFwUcZhNXN325a5mU3cNM9A
|
||||
SeAkNL9cajutGgIIemtiGpteB+1fElg3jDBIJKldnpO6gnr4VJB/kREMz61hUHFu
|
||||
Gz+007GuYh22gzUFPAD7nChx4+BJWHpms+1gVMOJhN7Q32ch4+7wT1ZRPu1C6G8J
|
||||
UR0MGl3r9hFiCWSRRlY//hFZwg96Vy16eiwTSrRchb71+4txEl8EEDGOiFLi2hj0
|
||||
jQUF5D9FAURwQ1eSqEl6hiALZGVO2Ld2VcKipDgOK1YgppIojeNOq4rWyhwRfpBX
|
||||
JzhcAKDhPFvLpNuum6Icdkg2o/gRjlf3X2+KBIAY/16ZkGg5156snWExmXwpvTx7
|
||||
4o/biIFXixxWQG5S9PUFfvmbLDrG+KTUS92UQcxl2w3P/PsK6sY=
|
||||
=fZcn
|
||||
-----END PGP SIGNATURE-----
|
||||
16
SOURCES/nmstate-2.2.7.tar.gz.asc
Normal file
16
SOURCES/nmstate-2.2.7.tar.gz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEE8f1XsqXpyNthgIbGbM3lj+QeKP8FAmPuL/wACgkQbM3lj+Qe
|
||||
KP9Y0g/+O1eW+RJt6f+XrEW8bIK8cnJhdBTZ80ptwvFV2UA9Jr1IW+HAZIRZd2kq
|
||||
wqHpFqsP4vyvPiOnOHKYfftdRJQj66tS589gy8f4A+RWUlnKYEo0M392FpWEdKFR
|
||||
1lhcH/2ySw/RghsmtkTJqo9LykBVE6T9KVspzm2GFvi5JvvaMMChG8OaHeLVen/B
|
||||
+mhJGFyQdhucjDNguU+py0gxIw1jcgsohdV7UaH+TcCR1xYZ4rweWiGauiLKIYKT
|
||||
KFOQWC+jCw6sZ6lRdvGMwQvQ2OdoOT7w75vOCJ6NgIwDYTIsxcAQwQ5KiAAg1Cln
|
||||
vlD4SOwB3yTzCXDyM137Y0TIKpRHTa9itDFs93Y2PrBFm/U7ZWzI2B7L2nXCdiZG
|
||||
4PBv1TzWlKR+egIppP2Jpty5RATJvOn5WgW033JdChuc3s4ACzO2TlURfSDtDM3I
|
||||
53nMslgt77JrLfw06Ree5R1oMVT6xOGrVerRhlGQtvCIBgqMbMd6kXDJyx2t6fsV
|
||||
rmvnuzQ786NEr0XBoec2ANUI9U2iuqvp/XzAZ4xkq7rUmZ7f924U/Z1j55t4Z91F
|
||||
SzY8gK9yOmabPiXwf9cGLV/duTU3TUUYX69OXgugStsbQkA+likmIvSx7caCz21t
|
||||
JnhpSkJqRfeVVrYcUpGpZAI4rY75A8WwSV/2OMht0yd8x57asHc=
|
||||
=AR0r
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -3,8 +3,8 @@
|
||||
%define libname libnmstate
|
||||
|
||||
Name: nmstate
|
||||
Version: 2.1.4
|
||||
Release: 2%{?dist}
|
||||
Version: 2.2.7
|
||||
Release: 1%{?dist}
|
||||
Summary: Declarative network manager API
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/%{srcname}/%{srcname}
|
||||
@ -12,7 +12,6 @@ Source0: https://github.com/nmstate/nmstate/releases/download/v%{version}
|
||||
Source1: https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-%{version}.tar.gz.asc
|
||||
Source2: https://nmstate.io/nmstate.gpg
|
||||
Source3: https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-vendor-%{version}.tar.xz
|
||||
Patch0: BZ-2148394_nm-Fix-moving-bridge-port-to-bond.patch
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: gnupg2
|
||||
@ -78,8 +77,7 @@ This package contains the Python 3 library for Nmstate.
|
||||
%prep
|
||||
gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg
|
||||
gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0}
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%autosetup -p1
|
||||
|
||||
pushd rust
|
||||
# Source3 is vendored dependencies
|
||||
@ -152,8 +150,47 @@ popd
|
||||
/sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Sat Nov 26 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.4-2
|
||||
- Fix moving bridge port to bond. RHBZ#2148394
|
||||
* Fri Feb 17 2023 Gris Ge <fge@redhat.com> - 2.2.7-1
|
||||
- Upgrade to 2.2.7
|
||||
|
||||
* Thu Feb 09 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.6-1
|
||||
- Upgrade to 2.2.6
|
||||
|
||||
* Thu Jan 26 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.5-1
|
||||
- Upgrade to 2.2.5
|
||||
|
||||
* Thu Jan 19 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.4-1
|
||||
- Upgrade to 2.2.4
|
||||
|
||||
* Wed Jan 11 2023 Gris Ge <fge@redhat.com> - 2.2.3-3
|
||||
- Fix OVSDB verification error
|
||||
|
||||
* Tue Jan 10 2023 Gris Ge <fge@redhat.com> - 2.2.3-2
|
||||
- Enable error message for rpm CI gating
|
||||
|
||||
* Mon Jan 09 2023 Gris Ge <fge@redhat.com> - 2.2.3-1
|
||||
- Upgrade to 2.2.3
|
||||
|
||||
* 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
|
||||
|
||||
* Thu Dec 01 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.2-0.alpha.20221201.c8c776e9
|
||||
- Upgrade to 2.2.2-0.alpha.20221201.c8c776e9
|
||||
|
||||
* Wed Nov 16 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.1-1
|
||||
- Upgrade to 2.2.1
|
||||
|
||||
* Thu Nov 10 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.1-0.alpha.20221110.a9cee09d
|
||||
- Upgrade to 2.2.1-0.alpha.20221110.a9cee09d
|
||||
|
||||
* Mon Oct 17 2022 Gris Ge <fge@redhat.com> - 2.2.0-1
|
||||
- Upgrade to 2.2.0
|
||||
|
||||
* Fri Oct 14 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.0-0.alpha.20221014.e54d9ae0
|
||||
- Upgrade to 2.2.0-alpha.20221014.e54d9ae0
|
||||
|
||||
* Mon Aug 15 2022 Gris Ge <fge@rehda.tcom> - 2.1.4-1
|
||||
- Upgrade to 2.1.4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user