.gitignore

@@ -1,4 +1,2 @@
-/nvmetcli-0.3.tar.gz
+SOURCES/nvmetcli-0.7.tar.gz
-/nvmetcli-0.4.tar.gz
 /nvmetcli-0.7.tar.gz
-/nvmetcli-0.8.tar.gz

0001-Documentation-fix-typo.patch

@@ -0,0 +1,28 @@
+From 297f40aef117875d98303b0535fb076626b91a19 Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Mon, 1 Feb 2021 15:47:56 +0100
+Subject: [PATCH] Documentation: fix typo
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+---
+ Documentation/nvmetcli.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Documentation/nvmetcli.txt b/Documentation/nvmetcli.txt
+index 05a0344..7d6ffda 100644
+--- a/Documentation/nvmetcli.txt
++++ b/Documentation/nvmetcli.txt
+@@ -116,7 +116,7 @@ your devices and all dependent modules are loaded,
+ and configfs is mounted on /sys/kernel/config
+ using:
+ 
+-	mount -t configs none /sys/kernel/config
++	mount -t configfs none /sys/kernel/config
+ 
+ The following section walks through a configuration example.
+ 
+-- 
+2.30.2
+

0002-nvmetcli-don-t-remove-ANA-Group-1-on-clear.patch

@@ -0,0 +1,33 @@
+From 0827df8deb5304854d9efc58e9df5971aa66f490 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Fri, 27 Mar 2020 08:01:34 +0100
+Subject: [PATCH] nvmetcli: don't remove ANA Group 1 on clear
+
+The first ANA group is maintained by the kernel so it cannot
+be deleted.
+
+Signed-off-by: Hannes Reinecke <hare@suse.de>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+---
+ nvmet/nvme.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/nvmet/nvme.py b/nvmet/nvme.py
+index 0647ddc..fdec4ff 100644
+--- a/nvmet/nvme.py
++++ b/nvmet/nvme.py
+@@ -845,6 +845,11 @@ class ANAGroup(CFSNode):
+ 
+         a._setup_attrs(n, err_func)
+ 
++    def delete(self):
++        # ANA Group 1 is automatically created/deleted
++        if self.grpid != 1:
++            super(ANAGroup, self).delete()
++
+     def dump(self):
+         d = super(ANAGroup, self).dump()
+         d['grpid'] = self.grpid
+-- 
+2.30.2
+

0003-nvmetcli-set-up-the-target-only-after-the-network-is.patch

@@ -0,0 +1,39 @@
+From 0855bcec9a5a9ceba586a5a1e1a8742b85424870 Mon Sep 17 00:00:00 2001
+From: Maurizio Lombardi <mlombard@redhat.com>
+Date: Tue, 28 Feb 2023 17:36:15 +0100
+Subject: [PATCH] nvmetcli: set up the target only after the network is
+ configured
+
+network.target only indicates that the network stack is up, but it
+doesn't mean that the network devices have been configured.
+
+Replace it with network-online.target, this fixes the following
+error when systemd restores the target configuration during boot:
+
+[   19.613251] nvmet_tcp: failed to bind port socket -99
+[FAILED] Failed to start Restore NVMe kernel target configuration.
+
+Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
+Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+---
+ nvmet.service | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/nvmet.service b/nvmet.service
+index 5c7991e..6f97a91 100644
+--- a/nvmet.service
++++ b/nvmet.service
+@@ -1,7 +1,8 @@
+ [Unit]
+ Description=Restore NVMe kernel target configuration
+ Requires=sys-kernel-config.mount
+-After=sys-kernel-config.mount network.target local-fs.target
++After=sys-kernel-config.mount network-online.target local-fs.target
++Wants=network-online.target
+ 
+ [Service]
+ Type=oneshot
+-- 
+2.31.1
+

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

nvmetcli.spec

@@ -1,12 +1,15 @@
 Name:           nvmetcli
 License:        ASL 2.0
+Group:          Applications/System
 Summary:        An adminstration shell for NVMe storage targets
-Version:        0.8
+Version:        0.7
-Release:        3%{?dist}
+Release:        5%{?dist}
 URL:            ftp://ftp.infradead.org/pub/nvmetcli/
 Source:         ftp://ftp.infradead.org/pub/nvmetcli/%{name}-%{version}.tar.gz
+Patch0:         0001-Documentation-fix-typo.patch
+Patch1:         0002-nvmetcli-don-t-remove-ANA-Group-1-on-clear.patch
+Patch2:         0003-nvmetcli-set-up-the-target-only-after-the-network-is.patch
 BuildArch:      noarch
-BuildRequires: make
 BuildRequires:  python3-devel python3-setuptools systemd-units asciidoc xmlto
 Requires:       python3-configshell python3-kmod
 Requires(post): systemd
@@ -19,7 +22,10 @@ nvmet in the Linux kernel.  It allows configuring the nvmet interactively
 as well as saving / restoring the configuration to / from a json file.
 
 %prep
-%autosetup -p1
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__python3} setup.py build
@@ -54,57 +60,26 @@ install -m 644 Documentation/nvmetcli.8.gz %{buildroot}%{_mandir}/man8/
 %{_mandir}/man8/nvmetcli.8.gz
 
 %changelog
-* Thu Oct 31 2024 Maurizio Lombardi <mlombard@redhat.com> - 0.8-3
+* Tue Apr 04 2023 Maurizio Lombardi <mlombard@redhat.com> - 0.7-5
-- Adding gating tests
+- Fix gating tests.
 
-* Thu Oct 31 2024 Maurizio Lombardi <mlombard@redhat.com> - 0.8-2
+* Tue Apr 04 2023 Maurizio Lombardi <mlombard@redhat.com> - 0.7-4
-- Rebuild for RHEL-58733
+- Fix BZ 2173777
 
-* Mon Sep 16 2024 Maurizio Lombardi <mlombard@redhat.com> - 0.8-1
+* Wed Apr 28 2021 Maurizio Lombardi <mlombard@redhat.com> - 0.7-3
-- Update to version 0.8
+- Fix a failure when executing a clear command
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.7-3
+* Thu Apr 22 2021 Maurizio Lombardi <mlombard@redhat.com> - 0.7-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Fix typo in the documentation
-  Related: rhbz#1991688
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.7-2
+* Thu Apr 22 2021 Maurizio Lombardi <mlombard@redhat.com> - 0.7-1
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Update to the latest version
 
-* Thu Feb 11 2021 Maurizio Lombardi <mlombard@redhat.com> - 0.7-1
+* Fri Sep 14 2018 Maurizio Lombardi <mlombard@redhat.com> - 0.6-2
-- Rebase to the latest version (git commit id 297f40aef117875d98303b0535fb076626b91a19)
+- Support python3 dictionary access.
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-13
+* Fri Jul 06 2018 Maurizio Lombardi <mlombard@redhat.com> - 0.6-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Update for new upstream release
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.4-11
-- Rebuilt for Python 3.9
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4-9
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4-8
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4-4
-- Rebuilt for Python 3.7
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

sources

@@ -1 +1 @@
-SHA512 (nvmetcli-0.8.tar.gz) = bacab259d1187cb7558c5c59119fc35018680f01fe9e882e114fc6da2149887c9e3986e9068265d299fc568c93b92dc96eb0d2c054111018dbc08ab1adb8e84f
+SHA512 (nvmetcli-0.7.tar.gz) = 2147f1dc4d6b9088671427faf100a1bbd337cd3e5852e9a24bb544e71e3c28141e7539f7e6c8257d4879b3fe7831d3e834026f82c232e7c7b83eda125da1abe0

tests/sanity/PURPOSE

@@ -1 +1 @@
-Sanity test for nvmetcli package
+Sanity test for nvme-cli package