From a9ab5e42646ea41ff42e553ed17fcbf051e211cd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 21 2020 08:12:32 +0000 Subject: import nmstate-1.0.0-1.el8 --- diff --git a/.gitignore b/.gitignore index 2edc2d8..5b959a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/nmstate-0.4.1.tar.gz +SOURCES/nmstate-1.0.0.tar.gz SOURCES/nmstate.gpg diff --git a/.nmstate.metadata b/.nmstate.metadata index ff15d95..e122472 100644 --- a/.nmstate.metadata +++ b/.nmstate.metadata @@ -1,2 +1,2 @@ -0a1d3a41bee44db30f662dac0edcb82292ca1d2e SOURCES/nmstate-0.4.1.tar.gz +881443b4095a8a9ad4e54a66ce15dc53dc632684 SOURCES/nmstate-1.0.0.tar.gz b5f872551d434e2c62b30d70471efaeede83ab44 SOURCES/nmstate.gpg diff --git a/SOURCES/nmstate-0.4.1.tar.gz.asc b/SOURCES/nmstate-0.4.1.tar.gz.asc deleted file mode 100644 index 62546b9..0000000 --- a/SOURCES/nmstate-0.4.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEfUQ+BAINyWGvqJXerIciWuEsPqMFAl+R760ACgkQrIciWuEs -PqM/ug//c1z4TWyAoKP/Upoa10jAprPF86+/vM67G6ddVFoBFEnKttANO1tsKsdv -quNh/znqFKqiyk3spZFA2wJEdTdk05+4TMfCYQzG0zEPiFMFN4y7julyNuDukANB -ml1uHTQ7/j3Wcp+tMvQuHTD9ak8oayWynKa/8wBpROTY9ONGVJlvfN1qxcw7PpIi -9XaWDBb7WndG/95Scr7Cr95OyAfwmylMIcMl0GdwdtYnW5uTKK+Wyzu7GXbPsUe8 -/Bc5XEVNP3zVV5jt9eP6FV4C7OhDmXd8pcw4VwCeisni+XfTDAN3LARCzHV6KDTN -wjT6V8LYdOW7dtn68jkrvG0PRYASGsj1Y6ZTma1qWc4Eri6EUDBakXPCC+HhIh1B -QAlXAgWCqBa7B4AcX3zc7bajD8PewVDnDe+o3TZqdXl1UPg09z9wnfK9Fe4H1Hjt -1yeCk9E9e1JoCpR/JLPlHrnX07oHWgiU1ySR2ssx/tKPQgjquzMZzDc175a6EsAU -8yw7r3TP2wwcRkAY4wJkPbjQTdFchuMuwoARYRm+nu+W+d+wpjdMG+yM+EkVKLlY -n82RTwzBNAwMIyLeIeKKVIPSJRqBQNYPDDSzM+8ZKAunaGGrh5E/plR0BoNedsce -xZY5thOO20BCCmyr4reslz7Oqifce54AhPknnailjY6US9E4Nkc= -=2sd5 ------END PGP SIGNATURE----- diff --git a/SOURCES/nmstate-1.0.0.tar.gz.asc b/SOURCES/nmstate-1.0.0.tar.gz.asc new file mode 100644 index 0000000..e5d52ca --- /dev/null +++ b/SOURCES/nmstate-1.0.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEfUQ+BAINyWGvqJXerIciWuEsPqMFAl/OHcwACgkQrIciWuEs +PqNd5A/5AaBVGnmSqt76/i77WJCr0Di8rI/TV1ETDHMvDMQ5wMh/wSqDa7YyWcVl +Hjel/j8bMvSpPd00U9wUT6nyq1QAx8ddJLh3A6M4Cudol2jRscSfSCovNB2PyiPa +EpCMa+4Mniw0N5noY7KFVlobsDGwR4uYf1gIc6v62ZqpfNTnWoGwkTUF3cwj0VG7 +JfAEU0+sNxc9f6aZuET4piSqcFOUIEsxnG3H85Q++IdP+EX45gRPH7d0SX9xKvxL +RM7Cwc1jy/xkL5P+3GSnzdehUjnVwz19BPQE808TFJQK3iVZJdlmpBc6zWyNWCVp +N/no1ctOmQLhyNd0EnORNl0j1ZwNR7obkUPIsWEnRlr2g8aRQBfkFnFAUoD1hm9L +dWi2LpOpx7RUr346Y4V/Zi4hOWoBX9s/WCDS1i3CMtI1YbC2tWSF6hhLEYeeLXj+ +juxiNKqmsgoExUmrtED7mE3Batjx62sJkU0bYkiTz8WHTQG1fnEw0uAtAhAcHtf8 +ws9G4WzJAjXa85nqnJwBj4rYIOcEnhMQUWFno7E93kEhgCh1tyoY9L9C6exoADs6 +tPJJDJR8Hq3TbVTYe5uV6tmmVXNdETqEI7y3Ee1MNzCk/PrBxSbMN6YGfVt2ymNx +1Owx0htkzG2rFMtN1oqC6rPchxTWLcKiOqCaQUfiCd5SoE2CT8s= +=7FjD +-----END PGP SIGNATURE----- diff --git a/SOURCES/vrf-Allow-vrf-port-to-hold-IP-information.patch b/SOURCES/vrf-Allow-vrf-port-to-hold-IP-information.patch deleted file mode 100644 index 9bf9f5e..0000000 --- a/SOURCES/vrf-Allow-vrf-port-to-hold-IP-information.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 14551813a0b729ee00cd7f56a06312035e78e304 Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Wed, 28 Oct 2020 12:36:45 +0800 -Subject: [PATCH] vrf: Allow vrf port to hold IP information - -According to https://www.kernel.org/doc/Documentation/networking/vrf.txt -the vrf port is allowed to hold IP address. - -Integration test case included. - -Signed-off-by: Gris Ge ---- - libnmstate/ifaces/base_iface.py | 6 +++++- - tests/integration/vrf_test.py | 36 +++++++++++++++++++++++++++++++++ - 2 files changed, 41 insertions(+), 1 deletion(-) - -diff --git a/libnmstate/ifaces/base_iface.py b/libnmstate/ifaces/base_iface.py -index ae54245..156aece 100644 ---- a/libnmstate/ifaces/base_iface.py -+++ b/libnmstate/ifaces/base_iface.py -@@ -233,6 +233,7 @@ class BaseIface: - if ( - ip_state.is_enabled - and self.controller -+ and self.controller_type != InterfaceType.VRF - and not self.can_have_ip_as_port - ): - raise NmstateValueError( -@@ -279,7 +280,10 @@ class BaseIface: - def set_controller(self, controller_iface_name, controller_type): - self._info[BaseIface.CONTROLLER_METADATA] = controller_iface_name - self._info[BaseIface.CONTROLLER_TYPE_METADATA] = controller_type -- if not self.can_have_ip_as_port: -+ if ( -+ not self.can_have_ip_as_port -+ and controller_type != InterfaceType.VRF -+ ): - for family in (Interface.IPV4, Interface.IPV6): - self._info[family] = {InterfaceIP.ENABLED: False} - --- -2.25.4 - diff --git a/SPECS/nmstate.spec b/SPECS/nmstate.spec index d452c24..0048f9f 100644 --- a/SPECS/nmstate.spec +++ b/SPECS/nmstate.spec @@ -3,15 +3,14 @@ %define libname libnmstate Name: nmstate -Version: 0.4.1 -Release: 2%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://www.nmstate.io/nmstate.gpg -Patch0: vrf-Allow-vrf-port-to-hold-IP-information.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -84,10 +83,16 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Tue Dec 08 2020 Fernando Fernandez Mancera - 1.0.0-1 +- Upgrade to 1.0.0 + +* Mon Nov 16 2020 Gris Ge - 1.0.0-0.1 +- Upgrade to 1.0.0 alpha 1 + * Wed Oct 28 2020 Fernando Fernandez Mancera - 0.4.1-2 - Allow VRF port to hold IP information -* Tue Oct 22 2020 Fernando Fernandez Mancera - 0.4.1-1 +* Thu Oct 22 2020 Fernando Fernandez Mancera - 0.4.1-1 - Upgrade to 0.4.1 * Tue Oct 20 2020 Fernando Fernandez Mancera - 0.4.0-3