From 04140e37c7b9d90345dfc54d1abcd3a751db6f2c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 14 2020 01:42:29 +0000 Subject: import nmstate-0.3.3-2.el8 --- diff --git a/.gitignore b/.gitignore index d60b9c8..cfa4a70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/nmstate-0.3.0.tar.gz +SOURCES/nmstate-0.3.3.tar.gz SOURCES/nmstate.gpg diff --git a/.nmstate.metadata b/.nmstate.metadata index 11e3ffc..dad6a47 100644 --- a/.nmstate.metadata +++ b/.nmstate.metadata @@ -1,2 +1,2 @@ -5d2960dbda57494afe39f2e9812adcd1d3f8fd40 SOURCES/nmstate-0.3.0.tar.gz +ef884235f0f34045c6741255910eeb026d28bfc6 SOURCES/nmstate-0.3.3.tar.gz c3efe2931425e910002e11ff34ef102fbfa0b9de SOURCES/nmstate.gpg diff --git a/SOURCES/BZ_1850698-dns-fix-remove-dns-config.patch b/SOURCES/BZ_1850698-dns-fix-remove-dns-config.patch new file mode 100644 index 0000000..337cc9d --- /dev/null +++ b/SOURCES/BZ_1850698-dns-fix-remove-dns-config.patch @@ -0,0 +1,37 @@ +From 3333cb8bfa77fb208bb4f6f62dce770aa235bc2b Mon Sep 17 00:00:00 2001 +From: Fernando Fernandez Mancera +Date: Mon, 6 Jul 2020 13:45:19 +0200 +Subject: [PATCH] dns: fix remove dns config + +This patch is fixing the support of removing the dns config. + +Ref: https://bugzilla.redhat.com/1850698 + +Signed-off-by: Fernando Fernandez Mancera +--- + libnmstate/dns.py | 8 +++++--- + tests/integration/dns_test.py | 4 +++- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/libnmstate/dns.py b/libnmstate/dns.py +index 1ec0d81..e41220f 100644 +--- a/libnmstate/dns.py ++++ b/libnmstate/dns.py +@@ -181,9 +181,11 @@ class DnsState: + + def verify(self, cur_dns_state): + cur_dns = DnsState(des_dns_state=None, cur_dns_state=cur_dns_state,) +- if self.config.get(DNS.SERVER) != cur_dns.config.get( +- DNS.SERVER +- ) or self.config.get(DNS.SEARCH) != cur_dns.config.get(DNS.SEARCH): ++ if self.config.get(DNS.SERVER, []) != cur_dns.config.get( ++ DNS.SERVER, [] ++ ) or self.config.get(DNS.SEARCH, []) != cur_dns.config.get( ++ DNS.SEARCH, [] ++ ): + raise NmstateVerificationError( + format_desired_current_state_diff( + {DNS.KEY: self.config}, {DNS.KEY: cur_dns.config}, +-- +2.25.4 + diff --git a/SOURCES/nmstate-0.3.0.tar.gz.asc b/SOURCES/nmstate-0.3.0.tar.gz.asc deleted file mode 100644 index aa3de40..0000000 --- a/SOURCES/nmstate-0.3.0.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE8f1XsqXpyNthgIbGbM3lj+QeKP8FAl60KKwACgkQbM3lj+Qe -KP9lww//SB6OPwkhUsNiapcV/dNsdwi+NtGlCHKbUtuhYNiLrYrPybDDeSu35U6K -JoJaHvh5vPpXWgU8kCjFb3JXvW9Q2JnjZ/XvasSRmdnyI8ezyYLze7cy8xqFkjbK -+Uzd75PIeLJXZucrLZZP2xM3VshQbnStYJL5zXGDXxtkpJGtWfkhm65d/ejIvSLA -56dnER3Es57OTiG1JCyTvnne9ZZ1AAFQQa+3lNkfq9xWSRUP4oeXarRvrLVnlnGl -0FlMT82VACRcexX2gKuNw4yKz27LSclrLhm1iDdXk2tux28frGFiTioAd0Shbnfk -d782QGhtF8dA8laN6MY3ptr+EULUHEFJt/yc6DCytb0dpAJ2HC40G+P25hMgMWz4 -wDaAgI8URl1fstzmQTf/Ga+JLE+nPX9Kyb0gFdBdiQ+JQVsvzkeueoVtsVjAgakt -eTbUIz5HZxOoKFf1DQ/UHt/dRiWjeHtM4OuzeJa4UD1eL0UMts1OE5rfX6/GkUG5 -EbmfOlixQk0ia6Ps9ED5nAaKF0HP0dnaJiFhLlPOfHrtPrR8T9a3/OS/BDlFoQnG -QrQOspz+eTZu/86HNIY7unu3GJN5beDUtVbukpjyK7HeiWwN6BMyMHJE7qd5klb9 -wFGNx2VKDF3BLmdR39xlu6oAcY8ikjfbY6i4AQuFi58VsEpOrDo= -=2Oob ------END PGP SIGNATURE----- diff --git a/SOURCES/nmstate-0.3.3.tar.gz.asc b/SOURCES/nmstate-0.3.3.tar.gz.asc new file mode 100644 index 0000000..6c6aca6 --- /dev/null +++ b/SOURCES/nmstate-0.3.3.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE8f1XsqXpyNthgIbGbM3lj+QeKP8FAl7+AiYACgkQbM3lj+Qe +KP+Wsg/+JOLSvkt+ko1DKALIyo+5b/rjCoon/WIZ72K9mNFNq8xyltVNcv8Idoge +hAaPXXIVs1PGb40j7w4omHp3obsi2mmYZZyKK7+vWjKayTnOT77RpXAQ9H9WoQYB +fhky4iuCGEmSS/BAV+o5OC/V/AeJfdLiKx87AjpPBIzu3lOLWTt8pv9/9vA724vY +wjtyawcJJGfoQT+7//75D3E80uCWrPN+SnWwY61VO9t6sIQKvc8PAxRFHYcoPvp9 +6/8DXqwE3Q0P7LiuMtX5tmqXCM56b4qsivcnsGOodsVOPhOrtf0/7NxHIysKTxi/ +zEP+GKZzeUKYVx+o2+QPhkXOgQ2N1HinrqomslVtk+rVSKZRl8Wnk75CK+Q8O698 +cNeLC4qNvcEKkpJ/lsyt/3Mqe/yigFP9NQSpiMboBCgfQrsGdJ923FtyjIQzii/A +16CNASeXIgmCmHVdmYHngCsEps1GM2cujvSf9nzKRq7KaPhxZ1LK6ZjZHHFPBszW +cM9LnxqTIOO5ZY+T2PU1MOj9QdP20mzuK0zMaGB+m8aqZ3jy7xrJxnPxzbSyXhkJ +1nPylYCqZAf8rsGfRIVd74jCNS8zXnzDju0y4lMYUMmJPT3RfeRWLP3TtjAlnB7l +LFCSftCwqUp9osKoSrkQeRnf0Bh1ShAw2brr8xwQ9/WFfSW6lyc= +=vjzJ +-----END PGP SIGNATURE----- diff --git a/SPECS/nmstate.spec b/SPECS/nmstate.spec index 8f8bdcd..d207863 100644 --- a/SPECS/nmstate.spec +++ b/SPECS/nmstate.spec @@ -3,14 +3,15 @@ %define libname libnmstate Name: nmstate -Version: 0.3.0 -Release: 1%{?dist} +Version: 0.3.3 +Release: 2%{?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: nmstate.gpg +Source2: https://www.nmstate.io/nmstate.gpg +Patch1: BZ_1850698-dns-fix-remove-dns-config.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -27,7 +28,7 @@ provider support on the southbound. %package -n python3-%{libname} Summary: nmstate Python 3 API library -Requires: NetworkManager-libnm >= 1:1.22.10 +Requires: NetworkManager-libnm >= 1:1.22.16 # Use Recommends for NetworkManager because only access to NM DBus is required, # but NM could be running on a different host Recommends: NetworkManager @@ -38,10 +39,19 @@ Recommends: NetworkManager-config-server Suggests: NetworkManager-ovs Suggests: NetworkManager-team +%package -n nmstate-plugin-ovsdb +Summary: nmstate plugin for OVS database manipulation +Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release} +# The python-openvswitch rpm pacakge is not in the same repo with nmstate, +# hence state it as Recommends, no requires. +Recommends: python3dist(ovs) %description -n python3-%{libname} This package contains the Python 3 library for nmstate. +%description -n nmstate-plugin-ovsdb +This package contains the nmstate plugin for OVS database manipulation. + %prep gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} @@ -64,8 +74,42 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %license LICENSE %{python3_sitelib}/%{libname} %{python3_sitelib}/%{srcname}-*.egg-info/ +%exclude %{python3_sitelib}/%{libname}/plugins/nmstate_plugin_* +%exclude %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_* + +%files -n nmstate-plugin-ovsdb +%{python3_sitelib}/%{libname}/plugins/nmstate_plugin_ovsdb* +%{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Mon Jul 06 2020 Fernando Fernandez Mancera - 0.3.3-2 +- Fix bug 1850698 + +* Thu Jul 02 2020 Fernando Fernandez Mancera - 0.3.3-1 +- Upgrade to 0.3.3 + +* Mon Jun 29 2020 Gris Ge - 0.3.2-6 +- Improve performance by remove unneeded calls. RHBZ#1820009 + +* Mon Jun 29 2020 Gris Ge - 0.3.2-5 +- Sort the pretty state with priority. RHBZ#1806474 + +* Mon Jun 29 2020 Gris Ge - 0.3.2-4 +- Canonicalize IP address. RHBZ#1816612 + +* Mon Jun 29 2020 Gris Ge - 0.3.2-3 +- Improve VLAN MTU error message. RHBZ#1788763 + +* Mon Jun 29 2020 Gris Ge - 0.3.2-2 +- Fix bug 1850698 + +* Mon Jun 15 2020 Fernando Fernandez Mancera - 0.3.2-1 +- Upgrade to 0.3.2 +- Sync. up with upstream spec file + +* Thu Jun 11 2020 Gris Ge - 0.3.1-1 +- Upgrade to 0.3.1 + * Wed May 13 2020 Fernando Fernandez Mancera - 0.3.0-1 - Upgrade to 0.3.0 - Sync. up with upstream spec file.