Compare commits
No commits in common. "c8s" and "c9-beta" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1 @@
|
||||
SOURCES/nvmetcli-0.7.tar.gz
|
||||
/nvmetcli-0.7.tar.gz
|
||||
|
1
.nvmetcli.metadata
Normal file
1
.nvmetcli.metadata
Normal file
@ -0,0 +1 @@
|
||||
a21ae6d6f7f912be7000384666ff2339f1b12f85 SOURCES/nvmetcli-0.7.tar.gz
|
@ -1,39 +0,0 @@
|
||||
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
|
||||
|
@ -1,7 +1,7 @@
|
||||
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
|
||||
Subject: [PATCH 01/12] nvmetcli: don't remove ANA Group 1 on clear
|
||||
|
||||
The first ANA group is maintained by the kernel so it cannot
|
||||
be deleted.
|
||||
@ -29,5 +29,5 @@ index 0647ddc..fdec4ff 100644
|
||||
d = super(ANAGroup, self).dump()
|
||||
d['grpid'] = self.grpid
|
||||
--
|
||||
2.30.2
|
||||
2.29.2
|
||||
|
30
SOURCES/0002-README-Update-URL-for-configshell-fb.patch
Normal file
30
SOURCES/0002-README-Update-URL-for-configshell-fb.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From a481736441b4c811f57fa84a8e3609b084f93835 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Asleson <tasleson@redhat.com>
|
||||
Date: Thu, 26 Mar 2020 13:07:44 -0500
|
||||
Subject: [PATCH 02/12] README: Update URL for configshell-fb
|
||||
|
||||
The github repository was moved. There is a github redirect,
|
||||
so this change is not strictly required.
|
||||
|
||||
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
---
|
||||
README | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/README b/README
|
||||
index c8717e8..5a4ecd1 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -7,7 +7,7 @@ to save, restore or clear the current NVMe target configuration.
|
||||
Installation
|
||||
------------
|
||||
Please install the configshell-fb package from
|
||||
-https://github.com/agrover/configshell-fb first.
|
||||
+https://github.com/open-iscsi/configshell-fb first.
|
||||
|
||||
nvmetcli can be run directly from the source directory or installed
|
||||
using setup.py.
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,61 @@
|
||||
From 48b8f318e0594d7adfec290ae47d9308eb0f65af Mon Sep 17 00:00:00 2001
|
||||
From: Tony Asleson <tasleson@redhat.com>
|
||||
Date: Thu, 26 Mar 2020 13:07:45 -0500
|
||||
Subject: [PATCH 03/12] nvmetcli: Improve IOError handling on restore
|
||||
|
||||
Not all IOErrors are caused by specifying a missing configuration
|
||||
file. When the file is present, dump the error exception text too,
|
||||
so the user has a better idea what is wrong.
|
||||
|
||||
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
---
|
||||
nvmetcli | 19 +++++++++++++++----
|
||||
1 file changed, 15 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/nvmetcli b/nvmetcli
|
||||
index 3d8c16e..a646232 100755
|
||||
--- a/nvmetcli
|
||||
+++ b/nvmetcli
|
||||
@@ -24,6 +24,7 @@ import os
|
||||
import sys
|
||||
import configshell_fb as configshell
|
||||
import nvmet as nvme
|
||||
+import errno
|
||||
from string import hexdigits
|
||||
import uuid
|
||||
|
||||
@@ -674,16 +675,26 @@ def save(to_file):
|
||||
|
||||
|
||||
def restore(from_file):
|
||||
+ errors = None
|
||||
+
|
||||
try:
|
||||
errors = nvme.Root().restore_from_file(from_file)
|
||||
- except IOError:
|
||||
- # Not an error if the restore file is not present
|
||||
- print("No saved config file at %s, ok, exiting" % from_file)
|
||||
- sys.exit(0)
|
||||
+ except IOError as e:
|
||||
+ if e.errno == errno.ENOENT:
|
||||
+ # Not an error if the restore file is not present
|
||||
+ print("No saved config file at %s, ok, exiting" % from_file)
|
||||
+ sys.exit(0)
|
||||
+ else:
|
||||
+ print("Error processing config file at %s, error %s, exiting" %
|
||||
+ (from_file, str(e)))
|
||||
+ sys.exit(1)
|
||||
|
||||
+ # These errors are non-fatal
|
||||
for error in errors:
|
||||
print(error)
|
||||
|
||||
+ sys.exit(0)
|
||||
+
|
||||
|
||||
def clear(unused):
|
||||
nvme.Root().clear_existing()
|
||||
--
|
||||
2.29.2
|
||||
|
29
SOURCES/0004-nvme.py-Explicit-close-is-redundant.patch
Normal file
29
SOURCES/0004-nvme.py-Explicit-close-is-redundant.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 226b73a4ae317c6aa3c7b00da2adbd1ec769ce34 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Asleson <tasleson@redhat.com>
|
||||
Date: Thu, 26 Mar 2020 13:07:46 -0500
|
||||
Subject: [PATCH 04/12] nvme.py: Explicit close is redundant
|
||||
|
||||
One of the benefits of using 'with' statement for open files is the
|
||||
close is going to be called regardless of what happens.
|
||||
|
||||
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
---
|
||||
nvmet/nvme.py | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/nvmet/nvme.py b/nvmet/nvme.py
|
||||
index fdec4ff..687a45a 100644
|
||||
--- a/nvmet/nvme.py
|
||||
+++ b/nvmet/nvme.py
|
||||
@@ -302,7 +302,6 @@ class Root(CFSNode):
|
||||
f.write("\n")
|
||||
f.flush()
|
||||
os.fsync(f.fileno())
|
||||
- f.close()
|
||||
|
||||
os.rename(savefile + ".temp", savefile)
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
40
SOURCES/0005-nvme.py-Sync-the-containing-directory.patch
Normal file
40
SOURCES/0005-nvme.py-Sync-the-containing-directory.patch
Normal file
@ -0,0 +1,40 @@
|
||||
From 12a8764c6113887c5691cab6a92bb1c13414395c Mon Sep 17 00:00:00 2001
|
||||
From: Tony Asleson <tasleson@redhat.com>
|
||||
Date: Thu, 26 Mar 2020 13:07:47 -0500
|
||||
Subject: [PATCH 05/12] nvme.py: Sync the containing directory
|
||||
|
||||
It's apparent that some thought went into making sure the config
|
||||
file makes it atomically to the fs. However, one thing is missing
|
||||
which is doing a fsync on the containing directory of the config file.
|
||||
|
||||
See: https://lwn.net/Articles/457667/
|
||||
|
||||
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
---
|
||||
nvmet/nvme.py | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/nvmet/nvme.py b/nvmet/nvme.py
|
||||
index 687a45a..04659de 100644
|
||||
--- a/nvmet/nvme.py
|
||||
+++ b/nvmet/nvme.py
|
||||
@@ -305,6 +305,15 @@ class Root(CFSNode):
|
||||
|
||||
os.rename(savefile + ".temp", savefile)
|
||||
|
||||
+ # Sync the containing directory too
|
||||
+ dir_fd = None
|
||||
+ try:
|
||||
+ dir_fd = os.open(savefile_dir, os.O_RDONLY)
|
||||
+ os.fsync(dir_fd)
|
||||
+ finally:
|
||||
+ if dir_fd:
|
||||
+ os.close(dir_fd)
|
||||
+
|
||||
def clear_existing(self):
|
||||
'''
|
||||
Remove entire current configuration.
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,35 @@
|
||||
From 75c178f6c2943490ef2c13df5863d6ac308f6ef1 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Asleson <tasleson@redhat.com>
|
||||
Date: Thu, 26 Mar 2020 13:07:48 -0500
|
||||
Subject: [PATCH 06/12] nvme.py: Make modprobe work for kmod lib too
|
||||
|
||||
The python library 'kmod' is included with libkmod, lets try to use that
|
||||
if the user isn't utilizing kmodpy.
|
||||
|
||||
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
---
|
||||
nvmet/nvme.py | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nvmet/nvme.py b/nvmet/nvme.py
|
||||
index 04659de..db8a03c 100644
|
||||
--- a/nvmet/nvme.py
|
||||
+++ b/nvmet/nvme.py
|
||||
@@ -253,7 +253,12 @@ class Root(CFSNode):
|
||||
except kmod.KmodError:
|
||||
pass
|
||||
except ImportError:
|
||||
- pass
|
||||
+ # Try the ctypes library included with the libkmod itself.
|
||||
+ try:
|
||||
+ import kmod
|
||||
+ kmod.Kmod().modprobe(modname)
|
||||
+ except Exception as e:
|
||||
+ pass
|
||||
|
||||
def _list_subsystems(self):
|
||||
self._check_self()
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,48 @@
|
||||
From 477a04b18e8754dc3f75110f0e7e6cdac70217aa Mon Sep 17 00:00:00 2001
|
||||
From: Tony Asleson <tasleson@redhat.com>
|
||||
Date: Thu, 26 Mar 2020 13:07:49 -0500
|
||||
Subject: [PATCH 07/12] test_nvmet.py: test_invalid_input fails for py3
|
||||
|
||||
When you run 'make test' using python 3 the unit test
|
||||
test_invalid_input fails with:
|
||||
|
||||
Traceback (most recent call last):
|
||||
File "/someuser/projects/nvmetcli/nvmet/test_nvmet.py", line 395, in
|
||||
test_invalid_input
|
||||
for i in range(l))
|
||||
File "/someuser/projects/nvmetcli/nvmet/test_nvmet.py", line 395, in
|
||||
<genexpr>
|
||||
for i in range(l))
|
||||
AttributeError: module 'string' has no attribute 'lowercase'
|
||||
|
||||
Python 3 does not have 'string.lowercase' ref.
|
||||
https://docs.python.org/3/library/string.html
|
||||
|
||||
Python 2 does ref.
|
||||
https://docs.python.org/2/library/string.html
|
||||
|
||||
Both have "string.ascii_lowercase" so lets leverage that to
|
||||
support both.
|
||||
|
||||
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
---
|
||||
nvmet/test_nvmet.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nvmet/test_nvmet.py b/nvmet/test_nvmet.py
|
||||
index 5caa546..aae4a86 100644
|
||||
--- a/nvmet/test_nvmet.py
|
||||
+++ b/nvmet/test_nvmet.py
|
||||
@@ -391,7 +391,7 @@ class TestNvmet(unittest.TestCase):
|
||||
nqn='/', mode='create')
|
||||
|
||||
for l in [ 257, 512, 1024, 2048 ]:
|
||||
- toolong = ''.join(random.choice(string.lowercase)
|
||||
+ toolong = ''.join(random.choice(string.ascii_lowercase)
|
||||
for i in range(l))
|
||||
self.assertRaises(nvme.CFSError, nvme.Subsystem,
|
||||
nqn=toolong, mode='create')
|
||||
--
|
||||
2.29.2
|
||||
|
50
SOURCES/0008-nvmetcli-Report-save-name-correctly.patch
Normal file
50
SOURCES/0008-nvmetcli-Report-save-name-correctly.patch
Normal file
@ -0,0 +1,50 @@
|
||||
From fd09200bba73011b4b7086c96e394ce875fdd38f Mon Sep 17 00:00:00 2001
|
||||
From: Tony Asleson <tasleson@redhat.com>
|
||||
Date: Thu, 26 Mar 2020 13:07:50 -0500
|
||||
Subject: [PATCH 08/12] nvmetcli: Report save name correctly
|
||||
|
||||
When a user simply does 'nvmetcli restore' without
|
||||
specifying a file name the default is used. However, if the
|
||||
restore fails you end up with the error message:
|
||||
|
||||
Error processing config file at None, error [Errno 1] Operation not
|
||||
permitted: '/sys/kernel/config/nvmet/ports/0/ana_groups/1', exiting
|
||||
|
||||
Correct file name if None in error path.
|
||||
|
||||
Error processing config file at /etc/nvmet/config.json, error \
|
||||
[Errno 1] Operation not permitted: \
|
||||
'/sys/kernel/config/nvmet/ports/1/ana_groups/1', exiting
|
||||
|
||||
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
---
|
||||
nvmet/__init__.py | 3 ++-
|
||||
nvmetcli | 3 +++
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nvmet/__init__.py b/nvmet/__init__.py
|
||||
index ca05de4..cf172bd 100644
|
||||
--- a/nvmet/__init__.py
|
||||
+++ b/nvmet/__init__.py
|
||||
@@ -1 +1,2 @@
|
||||
-from .nvme import Root, Subsystem, Namespace, Port, Host, Referral, ANAGroup
|
||||
+from .nvme import Root, Subsystem, Namespace, Port, Host, Referral, ANAGroup,\
|
||||
+ DEFAULT_SAVE_FILE
|
||||
diff --git a/nvmetcli b/nvmetcli
|
||||
index a646232..8ee8590 100755
|
||||
--- a/nvmetcli
|
||||
+++ b/nvmetcli
|
||||
@@ -680,6 +680,9 @@ def restore(from_file):
|
||||
try:
|
||||
errors = nvme.Root().restore_from_file(from_file)
|
||||
except IOError as e:
|
||||
+ if not from_file:
|
||||
+ from_file = nvme.DEFAULT_SAVE_FILE
|
||||
+
|
||||
if e.errno == errno.ENOENT:
|
||||
# Not an error if the restore file is not present
|
||||
print("No saved config file at %s, ok, exiting" % from_file)
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,146 @@
|
||||
From 35e92a1bfedf28868112165892b3eb2cd7f750ce Mon Sep 17 00:00:00 2001
|
||||
From: Tony Asleson <tasleson@redhat.com>
|
||||
Date: Thu, 2 Apr 2020 10:54:43 -0500
|
||||
Subject: [PATCH 09/12] nvmetcli: Allow different devices for make test
|
||||
|
||||
The test_nvmet.py by default uses /dev/ram0 and /dev/ram1 for 2 of the
|
||||
unit tests. Add env. variable to allow user to specify different devices
|
||||
or files. Additionally, skip these unit tests that require devices/files
|
||||
if they are not present. Update README too.
|
||||
|
||||
$ sudo make test
|
||||
......s...s.
|
||||
----------------------------------------------------------------------
|
||||
Ran 12 tests in 0.043s
|
||||
|
||||
OK (skipped=2)
|
||||
Name Stmts Miss Cover
|
||||
-----------------------------------------
|
||||
nvmet/__init__.py 1 0 100%
|
||||
nvmet/nvme.py 517 237 54%
|
||||
nvmet/test_nvmet.py 276 63 77%
|
||||
-----------------------------------------
|
||||
TOTAL 794 300 62%
|
||||
|
||||
$ sudo NVMET_TEST_DEVICES="/dev/sdc,/dev/sdd" make test
|
||||
............
|
||||
----------------------------------------------------------------------
|
||||
Ran 12 tests in 0.124s
|
||||
|
||||
OK
|
||||
Name Stmts Miss Cover
|
||||
-----------------------------------------
|
||||
nvmet/__init__.py 1 0 100%
|
||||
nvmet/nvme.py 517 100 81%
|
||||
nvmet/test_nvmet.py 276 4 99%
|
||||
-----------------------------------------
|
||||
TOTAL 794 104 87%
|
||||
|
||||
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
---
|
||||
README | 5 ++++-
|
||||
nvmet/test_nvmet.py | 26 ++++++++++++++++++++++----
|
||||
2 files changed, 26 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/README b/README
|
||||
index 5a4ecd1..44f1c33 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -47,7 +47,10 @@ Testing
|
||||
-------
|
||||
nvmetcli comes with a testsuite that tests itself and the kernel configfs
|
||||
interface for the NVMe target. To run it make sure you have nose2 and
|
||||
-the coverage plugin for it installed and simple run 'make test'.
|
||||
+the coverage plugin for it installed and simple run 'make test'. To run all
|
||||
+the tests you also need some test block devices or files. Default is to
|
||||
+use /dev/ram0 and /dev/ram1. You can override default with environmental
|
||||
+variable eg. NVMET_TEST_DEVICES="/dev/sdk,/dev/sdj" make test .
|
||||
|
||||
Development
|
||||
-----------------
|
||||
diff --git a/nvmet/test_nvmet.py b/nvmet/test_nvmet.py
|
||||
index aae4a86..f8ec232 100644
|
||||
--- a/nvmet/test_nvmet.py
|
||||
+++ b/nvmet/test_nvmet.py
|
||||
@@ -1,9 +1,22 @@
|
||||
|
||||
+import os
|
||||
import random
|
||||
+import stat
|
||||
import string
|
||||
import unittest
|
||||
import nvmet.nvme as nvme
|
||||
|
||||
+# Default test devices are ram disks, but allow user to specify different
|
||||
+# block devices or files.
|
||||
+NVMET_TEST_DEVICES = os.getenv("NVMET_TEST_DEVICES",
|
||||
+ "/dev/ram0,/dev/ram1").split(',')
|
||||
+
|
||||
+
|
||||
+def test_devices_present():
|
||||
+ return len([x for x in NVMET_TEST_DEVICES
|
||||
+ if os.path.exists(x) and
|
||||
+ (stat.S_ISBLK(os.stat(x).st_mode) or os.path.isfile(x))]) >= 2
|
||||
+
|
||||
|
||||
class TestNvmet(unittest.TestCase):
|
||||
def test_subsystem(self):
|
||||
@@ -101,6 +114,8 @@ class TestNvmet(unittest.TestCase):
|
||||
n.delete()
|
||||
self.assertEqual(len(list(s.namespaces)), 0)
|
||||
|
||||
+ @unittest.skipUnless(test_devices_present(),
|
||||
+ "Devices %s not available or suitable" % ','.join(NVMET_TEST_DEVICES))
|
||||
def test_namespace_attrs(self):
|
||||
root = nvme.Root()
|
||||
root.clear_existing()
|
||||
@@ -116,7 +131,7 @@ class TestNvmet(unittest.TestCase):
|
||||
self.assertRaises(nvme.CFSError, n.set_enable, 1)
|
||||
|
||||
# now set a path and enable
|
||||
- n.set_attr('device', 'path', '/dev/ram0')
|
||||
+ n.set_attr('device', 'path', NVMET_TEST_DEVICES[0])
|
||||
n.set_enable(1)
|
||||
self.assertTrue(n.get_enable())
|
||||
|
||||
@@ -125,7 +140,7 @@ class TestNvmet(unittest.TestCase):
|
||||
|
||||
# test that we can't write to attrs while enabled
|
||||
self.assertRaises(nvme.CFSError, n.set_attr, 'device', 'path',
|
||||
- '/dev/ram1')
|
||||
+ NVMET_TEST_DEVICES[1])
|
||||
self.assertRaises(nvme.CFSError, n.set_attr, 'device', 'nguid',
|
||||
'15f7767b-50e7-4441-949c-75b99153dea7')
|
||||
|
||||
@@ -403,6 +418,9 @@ class TestNvmet(unittest.TestCase):
|
||||
self.assertRaises(nvme.CFSError, nvme.Port,
|
||||
portid=1 << 17, mode='create')
|
||||
|
||||
+ @unittest.skipUnless(test_devices_present(),
|
||||
+ "Devices %s not available or suitable" % ','.join(
|
||||
+ NVMET_TEST_DEVICES))
|
||||
def test_save_restore(self):
|
||||
root = nvme.Root()
|
||||
root.clear_existing()
|
||||
@@ -416,7 +434,7 @@ class TestNvmet(unittest.TestCase):
|
||||
s2.set_attr('attr', 'allow_any_host', 1)
|
||||
|
||||
n = nvme.Namespace(s, nsid=42, mode='create')
|
||||
- n.set_attr('device', 'path', '/dev/ram0')
|
||||
+ n.set_attr('device', 'path', NVMET_TEST_DEVICES[0])
|
||||
n.set_enable(1)
|
||||
|
||||
nguid = n.get_attr('device', 'nguid')
|
||||
@@ -454,7 +472,7 @@ class TestNvmet(unittest.TestCase):
|
||||
|
||||
# and check everything is still the same
|
||||
self.assertTrue(n.get_enable())
|
||||
- self.assertEqual(n.get_attr('device', 'path'), '/dev/ram0')
|
||||
+ self.assertEqual(n.get_attr('device', 'path'), NVMET_TEST_DEVICES[0])
|
||||
self.assertEqual(n.get_attr('device', 'nguid'), nguid)
|
||||
|
||||
self.assertEqual(p.get_attr('addr', 'trtype'), 'loop')
|
||||
--
|
||||
2.29.2
|
||||
|
57
SOURCES/0010-nvmetcli-Correct-xrange-usage-for-py3.patch
Normal file
57
SOURCES/0010-nvmetcli-Correct-xrange-usage-for-py3.patch
Normal file
@ -0,0 +1,57 @@
|
||||
From 9da40b0433b8338f82c2c910b1057e1e1061b9a0 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Asleson <tasleson@redhat.com>
|
||||
Date: Wed, 1 Apr 2020 14:13:16 -0500
|
||||
Subject: [PATCH 10/12] nvmetcli: Correct xrange usage for py3
|
||||
|
||||
If you are in a namespace and simply do a 'create' without specifying
|
||||
a value you will get:
|
||||
|
||||
/subsystems/n...f8/namespaces> create
|
||||
name 'xrange' is not defined
|
||||
subsystems/n...f8/namespaces>
|
||||
|
||||
This is because xrange is not defined in python3 as python3 changed
|
||||
it to range. As the code is already using six use six.move.xrange
|
||||
which works for both python2 & python3.
|
||||
|
||||
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
||||
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
---
|
||||
nvmet/nvme.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/nvmet/nvme.py b/nvmet/nvme.py
|
||||
index db8a03c..83fd75b 100644
|
||||
--- a/nvmet/nvme.py
|
||||
+++ b/nvmet/nvme.py
|
||||
@@ -23,7 +23,7 @@ import stat
|
||||
import uuid
|
||||
import json
|
||||
from glob import iglob as glob
|
||||
-from six import iteritems
|
||||
+from six import iteritems, moves
|
||||
|
||||
DEFAULT_SAVE_FILE = '/etc/nvmet/config.json'
|
||||
|
||||
@@ -556,7 +556,7 @@ class Namespace(CFSNode):
|
||||
raise CFSError("Need NSID for lookup")
|
||||
|
||||
nsids = [n.nsid for n in subsystem.namespaces]
|
||||
- for index in xrange(1, self.MAX_NSID + 1):
|
||||
+ for index in moves.xrange(1, self.MAX_NSID + 1):
|
||||
if index not in nsids:
|
||||
nsid = index
|
||||
break
|
||||
@@ -816,7 +816,7 @@ class ANAGroup(CFSNode):
|
||||
raise CFSError("Need grpid for lookup")
|
||||
|
||||
grpids = [n.grpid for n in port.ana_groups]
|
||||
- for index in xrange(2, self.MAX_GRPID + 1):
|
||||
+ for index in moves.xrange(2, self.MAX_GRPID + 1):
|
||||
if index not in grpids:
|
||||
grpid = index
|
||||
break
|
||||
--
|
||||
2.29.2
|
||||
|
99
SOURCES/0011-nvmetcli-add-a-tcp-example-json.patch
Normal file
99
SOURCES/0011-nvmetcli-add-a-tcp-example-json.patch
Normal file
@ -0,0 +1,99 @@
|
||||
From 73dcf7ef6b6aa80c87c61f08583cba97ad1c626a Mon Sep 17 00:00:00 2001
|
||||
From: zhenwei pi <pizhenwei@bytedance.com>
|
||||
Date: Thu, 10 Dec 2020 17:06:56 +0800
|
||||
Subject: [PATCH 11/12] nvmetcli: add a tcp example json
|
||||
|
||||
Run a tcp nvme target on linux-5.10-rc version, and save the config
|
||||
as an example.
|
||||
|
||||
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
|
||||
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||
---
|
||||
README | 5 +++++
|
||||
tcp.json | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 63 insertions(+)
|
||||
create mode 100644 tcp.json
|
||||
|
||||
diff --git a/README b/README
|
||||
index 44f1c33..6ebe666 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -41,6 +41,11 @@ fc.json fits your setup:
|
||||
|
||||
./nvmetcli restore fc.json
|
||||
|
||||
+Or to load the tcp + no host authentication version do the following
|
||||
+after you've ensured that the IP address in tcp.json fits your setup:
|
||||
+
|
||||
+ ./nvmetcli restore tcp.json
|
||||
+
|
||||
These files can also be edited directly using your favorite editor.
|
||||
|
||||
Testing
|
||||
diff --git a/tcp.json b/tcp.json
|
||||
new file mode 100644
|
||||
index 0000000..e6ff029
|
||||
--- /dev/null
|
||||
+++ b/tcp.json
|
||||
@@ -0,0 +1,58 @@
|
||||
+{
|
||||
+ "hosts": [],
|
||||
+ "ports": [
|
||||
+ {
|
||||
+ "addr": {
|
||||
+ "adrfam": "ipv4",
|
||||
+ "traddr": "192.168.122.33",
|
||||
+ "treq": "not specified",
|
||||
+ "trsvcid": "4420",
|
||||
+ "trtype": "tcp"
|
||||
+ },
|
||||
+ "ana_groups": [
|
||||
+ {
|
||||
+ "ana": {
|
||||
+ "state": "optimized"
|
||||
+ },
|
||||
+ "grpid": 1
|
||||
+ }
|
||||
+ ],
|
||||
+ "param": {
|
||||
+ "inline_data_size": "16384",
|
||||
+ "pi_enable": "0"
|
||||
+ },
|
||||
+ "portid": 1,
|
||||
+ "referrals": [],
|
||||
+ "subsystems": [
|
||||
+ "nvmet-always"
|
||||
+ ]
|
||||
+ }
|
||||
+ ],
|
||||
+ "subsystems": [
|
||||
+ {
|
||||
+ "allowed_hosts": [],
|
||||
+ "attr": {
|
||||
+ "allow_any_host": "1",
|
||||
+ "cntlid_max": "65519",
|
||||
+ "cntlid_min": "1",
|
||||
+ "model": "Linux",
|
||||
+ "pi_enable": "0",
|
||||
+ "serial": "123456789abcdef",
|
||||
+ "version": "1.3"
|
||||
+ },
|
||||
+ "namespaces": [
|
||||
+ {
|
||||
+ "ana_grpid": 1,
|
||||
+ "device": {
|
||||
+ "nguid": "00000000-0000-0000-0000-000000000000",
|
||||
+ "path": "/dev/nvme0n1",
|
||||
+ "uuid": "d592cdf3-5d1c-44e0-8412-3fcf7d99df27"
|
||||
+ },
|
||||
+ "enable": 1,
|
||||
+ "nsid": 1
|
||||
+ }
|
||||
+ ],
|
||||
+ "nqn": "nvmet-always"
|
||||
+ }
|
||||
+ ]
|
||||
+}
|
||||
--
|
||||
2.29.2
|
||||
|
@ -1,7 +1,7 @@
|
||||
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
|
||||
Subject: [PATCH 12/12] Documentation: fix typo
|
||||
|
||||
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
|
||||
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
|
||||
@ -24,5 +24,5 @@ index 05a0344..7d6ffda 100644
|
||||
The following section walks through a configuration example.
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.29.2
|
||||
|
123
SPECS/nvmetcli.spec
Normal file
123
SPECS/nvmetcli.spec
Normal file
@ -0,0 +1,123 @@
|
||||
Name: nvmetcli
|
||||
License: ASL 2.0
|
||||
Summary: An adminstration shell for NVMe storage targets
|
||||
Version: 0.7
|
||||
Release: 3%{?dist}
|
||||
URL: ftp://ftp.infradead.org/pub/nvmetcli/
|
||||
Source: ftp://ftp.infradead.org/pub/nvmetcli/%{name}-%{version}.tar.gz
|
||||
Patch00: 0001-nvmetcli-don-t-remove-ANA-Group-1-on-clear.patch
|
||||
Patch01: 0002-README-Update-URL-for-configshell-fb.patch
|
||||
Patch02: 0003-nvmetcli-Improve-IOError-handling-on-restore.patch
|
||||
Patch03: 0004-nvme.py-Explicit-close-is-redundant.patch
|
||||
Patch04: 0005-nvme.py-Sync-the-containing-directory.patch
|
||||
Patch05: 0006-nvme.py-Make-modprobe-work-for-kmod-lib-too.patch
|
||||
Patch06: 0007-test_nvmet.py-test_invalid_input-fails-for-py3.patch
|
||||
Patch07: 0008-nvmetcli-Report-save-name-correctly.patch
|
||||
Patch08: 0009-nvmetcli-Allow-different-devices-for-make-test.patch
|
||||
Patch09: 0010-nvmetcli-Correct-xrange-usage-for-py3.patch
|
||||
Patch10: 0011-nvmetcli-add-a-tcp-example-json.patch
|
||||
Patch11: 0012-Documentation-fix-typo.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: make
|
||||
BuildRequires: python3-devel python3-setuptools systemd-units asciidoc xmlto
|
||||
Requires: python3-configshell python3-kmod
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
%description
|
||||
This package contains the command line interface to the NVMe over Fabrics
|
||||
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
|
||||
|
||||
%build
|
||||
%{__python3} setup.py build
|
||||
cd Documentation
|
||||
make
|
||||
gzip --stdout nvmetcli.8 > nvmetcli.8.gz
|
||||
|
||||
%install
|
||||
%{__python3} setup.py install --skip-build --root %{buildroot}
|
||||
mkdir -p %{buildroot}%{_unitdir}
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/nvmet
|
||||
install -m 644 nvmet.service %{buildroot}%{_unitdir}/nvmet.service
|
||||
mkdir -p %{buildroot}%{_mandir}/man8/
|
||||
install -m 644 Documentation/nvmetcli.8.gz %{buildroot}%{_mandir}/man8/
|
||||
|
||||
%post
|
||||
%systemd_post nvmet.service
|
||||
|
||||
%preun
|
||||
%systemd_preun nvmet.service
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart nvmet.service
|
||||
|
||||
%files
|
||||
%{python3_sitelib}/*
|
||||
%dir %{_sysconfdir}/nvmet
|
||||
%{_sbindir}/nvmetcli
|
||||
%{_unitdir}/nvmet.service
|
||||
%doc README
|
||||
%license COPYING
|
||||
%{_mandir}/man8/nvmetcli.8.gz
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.7-3
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.7-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Thu Feb 11 2021 Maurizio Lombardi <mlombard@redhat.com> - 0.7-1
|
||||
- Rebase to the latest version (git commit id 297f40aef117875d98303b0535fb076626b91a19)
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* 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
|
||||
|
||||
* Tue May 9 2017 Andy Grover <agrover@redhat.com> - 0.4-1
|
||||
- Update for new upstream release
|
||||
- Remove fix-setup.patch
|
||||
|
||||
* Tue Feb 21 2017 Andy Grover <agrover@redhat.com> - 0.3-1
|
||||
- Update for new upstream release
|
||||
|
||||
* Wed Oct 12 2016 Andy Grover <agrover@redhat.com> - 0.2-1
|
||||
- Initial packaging
|
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
@ -1,95 +0,0 @@
|
||||
Name: nvmetcli
|
||||
License: ASL 2.0
|
||||
Group: Applications/System
|
||||
Summary: An adminstration shell for NVMe storage targets
|
||||
Version: 0.7
|
||||
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: python3-devel python3-setuptools systemd-units asciidoc xmlto
|
||||
Requires: python3-configshell python3-kmod
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
%description
|
||||
This package contains the command line interface to the NVMe over Fabrics
|
||||
nvmet in the Linux kernel. It allows configuring the nvmet interactively
|
||||
as well as saving / restoring the configuration to / from a json file.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%{__python3} setup.py build
|
||||
cd Documentation
|
||||
make
|
||||
gzip --stdout nvmetcli.8 > nvmetcli.8.gz
|
||||
|
||||
%install
|
||||
%{__python3} setup.py install --skip-build --root %{buildroot}
|
||||
mkdir -p %{buildroot}%{_unitdir}
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/nvmet
|
||||
install -m 644 nvmet.service %{buildroot}%{_unitdir}/nvmet.service
|
||||
mkdir -p %{buildroot}%{_mandir}/man8/
|
||||
install -m 644 Documentation/nvmetcli.8.gz %{buildroot}%{_mandir}/man8/
|
||||
|
||||
%post
|
||||
%systemd_post nvmet.service
|
||||
|
||||
%preun
|
||||
%systemd_preun nvmet.service
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart nvmet.service
|
||||
|
||||
%files
|
||||
%{python3_sitelib}/*
|
||||
%dir %{_sysconfdir}/nvmet
|
||||
%{_sbindir}/nvmetcli
|
||||
%{_unitdir}/nvmet.service
|
||||
%doc README
|
||||
%license COPYING
|
||||
%{_mandir}/man8/nvmetcli.8.gz
|
||||
|
||||
%changelog
|
||||
* Tue Apr 04 2023 Maurizio Lombardi <mlombard@redhat.com> - 0.7-5
|
||||
- Fix gating tests.
|
||||
|
||||
* Tue Apr 04 2023 Maurizio Lombardi <mlombard@redhat.com> - 0.7-4
|
||||
- Fix BZ 2173777
|
||||
|
||||
* Wed Apr 28 2021 Maurizio Lombardi <mlombard@redhat.com> - 0.7-3
|
||||
- Fix a failure when executing a clear command
|
||||
|
||||
* Thu Apr 22 2021 Maurizio Lombardi <mlombard@redhat.com> - 0.7-1
|
||||
- Fix typo in the documentation
|
||||
|
||||
* Thu Apr 22 2021 Maurizio Lombardi <mlombard@redhat.com> - 0.7-1
|
||||
- Update to the latest version
|
||||
|
||||
* Fri Sep 14 2018 Maurizio Lombardi <mlombard@redhat.com> - 0.6-2
|
||||
- Support python3 dictionary access.
|
||||
|
||||
* Fri Jul 06 2018 Maurizio Lombardi <mlombard@redhat.com> - 0.6-1
|
||||
- Update for new upstream release
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue May 9 2017 Andy Grover <agrover@redhat.com> - 0.4-1
|
||||
- Update for new upstream release
|
||||
- Remove fix-setup.patch
|
||||
|
||||
* Tue Feb 21 2017 Andy Grover <agrover@redhat.com> - 0.3-1
|
||||
- Update for new upstream release
|
||||
|
||||
* Wed Oct 12 2016 Andy Grover <agrover@redhat.com> - 0.2-1
|
||||
- Initial packaging
|
1
sources
1
sources
@ -1 +0,0 @@
|
||||
SHA512 (nvmetcli-0.7.tar.gz) = 2147f1dc4d6b9088671427faf100a1bbd337cd3e5852e9a24bb544e71e3c28141e7539f7e6c8257d4879b3fe7831d3e834026f82c232e7c7b83eda125da1abe0
|
@ -1,272 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (c) 2016 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Author: Yi Zhang <yizhan@redhat.com>
|
||||
|
||||
# filename: function
|
||||
|
||||
# USAGE
|
||||
|
||||
test x$LXT_TC = x || return
|
||||
LXT_TC=1
|
||||
|
||||
#
|
||||
# print the current date
|
||||
# usage: d=$(tdate)
|
||||
#
|
||||
tdate ()
|
||||
{
|
||||
date '+%T' 2>/dev/null
|
||||
}
|
||||
|
||||
#
|
||||
# print the log information
|
||||
# usage: tlog "hello world" "WARNING"
|
||||
#
|
||||
tlog ()
|
||||
{
|
||||
local msg=$1
|
||||
local log_level=${2:-INFO}
|
||||
local cur_date=$(tdate)
|
||||
|
||||
echo "[$log_level][$cur_date]$msg"
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
#
|
||||
# run the cmd and format the log. return the exitint status of cmd
|
||||
# use the global variables: tSTDOUT and tSTDERR to return the stdout and stderr
|
||||
# usage: trun "ls"
|
||||
# trun "ls"; echo $?
|
||||
# stdout=$tSTDOUT
|
||||
# stderr=$tSTDERR
|
||||
#
|
||||
trun ()
|
||||
{
|
||||
local cmd="$*"
|
||||
|
||||
_trun_ "$cmd"
|
||||
}
|
||||
|
||||
#
|
||||
# verify the execution of command
|
||||
# if the cmd return 0, mark this checkpoint failed and return 1
|
||||
# if not, mark it passed and return 0
|
||||
# usage: tnot "ls /not_existing"
|
||||
#
|
||||
tnot () {
|
||||
local cmd="$*"
|
||||
_trun_ "$cmd" 1
|
||||
if test $? -eq 0; then
|
||||
tfail_ "$cmd" ;
|
||||
else
|
||||
tpass_ "$cmd" ;
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# verify the execution of command
|
||||
# if the cmd return 0, mark this checkpoint passed and return 0
|
||||
# if not, mark it failed and return 1
|
||||
# usage: tok "ls /"
|
||||
#
|
||||
tok ()
|
||||
{
|
||||
local cmd="$*"
|
||||
_trun_ "$cmd" 0
|
||||
if test $? -eq 0; then
|
||||
tpass_ "$cmd" ;
|
||||
else
|
||||
tfail_ "$cmd" ;
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# verify the execution of command
|
||||
# if the cmd return 0, mark this checkpoint passed and return 0
|
||||
# if not, mark it failes and exit
|
||||
# usage: terr "ls"
|
||||
#
|
||||
#terr ()
|
||||
#{
|
||||
# tok "$*" || tend
|
||||
#}
|
||||
|
||||
#
|
||||
# verify the execution of command
|
||||
# if the cmd return 0, will continue to run the script
|
||||
# if not, mark it failes and exit
|
||||
# usage: terr "ls"
|
||||
#
|
||||
terr ()
|
||||
{
|
||||
local cmd="$*"
|
||||
_trun_ "$cmd" 0
|
||||
if test $? -ne 0; then
|
||||
tfail_ "$cmd" ;
|
||||
tend ;
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# exit the program and print the log message
|
||||
# usage: texit "error message" 100
|
||||
# similar to the exception
|
||||
#
|
||||
texit ()
|
||||
{
|
||||
msg=$1
|
||||
err=$2
|
||||
is_null $err && err=1
|
||||
test $err -lt 1 || err=1
|
||||
|
||||
tlog "$msg" "ERROR"
|
||||
exit $2
|
||||
}
|
||||
|
||||
#
|
||||
# print the test report, cleanup the testing bed and close the testing.
|
||||
# usage: tend
|
||||
#
|
||||
tend ()
|
||||
{
|
||||
local pcount=$(wc -l $tPASS_FILE | awk '{print $1}')
|
||||
local fcount=$(wc -l $tFAIL_FILE | awk '{print $1}')
|
||||
local total=$(( $pcount + $fcount ))
|
||||
|
||||
echo "#################################Test Report###############################"
|
||||
echo "TOTAL : $total"
|
||||
echo "PASSED : $pcount"
|
||||
echo "FAILED : $fcount"
|
||||
cat $tPASS_FILE $tFAIL_FILE
|
||||
echo "###########################End of running $0########################"
|
||||
|
||||
#cleanup
|
||||
rm -f $tPASS_FILE $tFAIL_FILE $tRETURN_FILE $tSTDERR_FILE
|
||||
# rm -rf $LXT_TMP_DIR
|
||||
if [[ $pcount -eq 0 ]] && [[ $total -eq 0 ]];then
|
||||
exit 0
|
||||
fi
|
||||
test $pcount -eq 0 && exit 1
|
||||
test $pcount -eq $total && exit 0
|
||||
exit 1
|
||||
}
|
||||
|
||||
#
|
||||
# private function
|
||||
#
|
||||
|
||||
#
|
||||
# print the error message and call stack. return 1
|
||||
#
|
||||
tfail_ ()
|
||||
{
|
||||
local msg=$*
|
||||
tlog "$msg" "ERROR" >>$tFAIL_FILE
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
#
|
||||
# print the sucessful message. return 0
|
||||
#
|
||||
tpass_ ()
|
||||
{
|
||||
local msg=$*
|
||||
tlog "$msg" "PASS" >> $tPASS_FILE
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
_trun_ ()
|
||||
{
|
||||
local cmd="$1"
|
||||
local chk="$2"
|
||||
local cur_date=$(tdate)
|
||||
|
||||
local stdout=$(eval "$cmd" 2>$tSTDERR_FILE; echo $? >$tRETURN_FILE 2>/dev/null)
|
||||
#timeout -- how to set timeout?
|
||||
local exit_status=$(< $tRETURN_FILE)
|
||||
local stderr=$(< $tSTDERR_FILE)
|
||||
local msg=CMD
|
||||
#tnot
|
||||
if test x$chk = x1; then
|
||||
test $exit_status -eq 0 || msg=PASS
|
||||
test $exit_status -eq 0 && msg=FAIL
|
||||
#should let the tester know this is the negative testing
|
||||
#if cmd return 0 we will return 1 and vice versa
|
||||
cmd="[NOT] $cmd"
|
||||
fi
|
||||
#tok
|
||||
if test x$chk = x0; then
|
||||
test $exit_status -eq 0 && msg=PASS
|
||||
test $exit_status -eq 0 || msg=FAIL
|
||||
fi
|
||||
|
||||
tSTDOUT=$stdout
|
||||
tSTDERR=$stderr
|
||||
|
||||
test $tIGNORE_STDOUT -eq 1 && stdout='redirect the stdout to /dev/null'
|
||||
test $tIGNORE_STDERR -eq 1 && stderr='redirect the stderr to /dev/null'
|
||||
|
||||
echo "[$msg][$cur_date][$HOSTNAME]$cmd"
|
||||
echo "STDOUT:"
|
||||
test "x$stdout" = x || echo "$stdout"
|
||||
echo "STDERR:$stderr"
|
||||
echo "RETURN:$exit_status"
|
||||
echo
|
||||
|
||||
return $exit_status
|
||||
}
|
||||
|
||||
#
|
||||
# setup the testing environment
|
||||
#
|
||||
_tsetup_ ()
|
||||
{
|
||||
|
||||
LXT_TMP_DIR="/mnt/testarea/lxt";
|
||||
|
||||
test -z "$HOSTNAME" && HOSTNAME=$(hostname)
|
||||
test -d "$LXT_TMP_DIR" || mkdir -p "$LXT_TMP_DIR" >& /dev/null || exit 1
|
||||
|
||||
tSTDERR_FILE="$LXT_TMP_DIR/stderr.$$"
|
||||
test -e "$tSTDERR_FILE" || > "$tSTDERR_FILE" || exit 1
|
||||
tRETURN_FILE="$LXT_TMP_DIR/return.$$"
|
||||
test -e "$tRETURN_FILE" || > "$tRETURN_FILE" || exit 1
|
||||
tPASS_FILE="$LXT_TMP_DIR/tc.pass.$$"
|
||||
test -e "$tPASS_FILE" || > "$tPASS_FILE" || exit 1
|
||||
tFAIL_FILE="$LXT_TMP_DIR/tc.fail.$$"
|
||||
test -e "$tFAIL_FILE" || > "$tFAIL_FILE" || exit 1
|
||||
}
|
||||
|
||||
#
|
||||
# main
|
||||
#
|
||||
|
||||
# global variables
|
||||
tIGNORE_STDOUT=0
|
||||
tIGNORE_STDERR=0
|
||||
tSTDOUT=
|
||||
tSTDERR=
|
||||
#LXT_TMP_DIR
|
||||
# only used in this file
|
||||
tPASS_FILE=
|
||||
tFAIL_FILE=
|
||||
|
||||
_tsetup_
|
@ -1,675 +0,0 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<http://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||
|
@ -1,47 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (c) 2016 Red Hat, Inc.
|
||||
# #
|
||||
# # This program is free software: you can redistribute it and/or modify
|
||||
# # it under the terms of the GNU General Public License as published by
|
||||
# # the Free Software Foundation, either version 3 of the License, or
|
||||
# # (at your option) any later version.
|
||||
# #
|
||||
# # This program is distributed in the hope that it will be useful,
|
||||
# # but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# # GNU General Public License for more details.
|
||||
# #
|
||||
# # You should have received a copy of the GNU General Public License
|
||||
# # along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# # Author: Yi Zhang <yizhan@redhat.com>
|
||||
|
||||
.PHONY: all install download clean LICENSE
|
||||
|
||||
BUILT_FILES=
|
||||
|
||||
FILES=$(METADATA) Makefile PURPOSE main.sh
|
||||
|
||||
run: $(FILES) build
|
||||
./main.sh
|
||||
|
||||
build: $(BUILT_FILES)
|
||||
chmod a+x ./main.sh
|
||||
|
||||
clean:
|
||||
rm -f *~ *.rpm $(BUILT_FILES)
|
||||
|
||||
$(METADATA): Makefile
|
||||
@touch $(METADATA)
|
||||
@echo "Owner: Yi Zhang <yizhan@redhat.com>" > $(METADATA)
|
||||
@echo "Name: $(TEST)" >> $(METADATA)
|
||||
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||
@echo "License: GPLv3" >> $(METADATA)
|
||||
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||
@echo "Description: nvmetcli sanity test" >> $(METADATA)
|
||||
@echo "TestTime: 15m" >> $(METADATA)
|
||||
@echo "RunFor: nvmetcli" >> $(METADATA)
|
||||
@echo "Requires: nvmetcli" >> $(METADATA)
|
||||
|
||||
rhts-lint $(METADATA)
|
@ -1 +0,0 @@
|
||||
Sanity test for nvme-cli package
|
@ -1,34 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (c) 2016 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Author: Yi Zhang <yizhan@redhat.com>
|
||||
|
||||
#set -x
|
||||
source ../include/tc.sh || exit 200
|
||||
|
||||
tlog "running $0"
|
||||
|
||||
tok "yum -y reinstall nvmetcli"
|
||||
tok "yum -y remove nvmetcli"
|
||||
tok "yum -y install nvmetcli"
|
||||
tok "which nvmetcli"
|
||||
tok "yum info nvmetcli"
|
||||
tok "[[ -f "/usr/sbin/nvmetcli" ]]"
|
||||
tok "modprobe nvmet"
|
||||
tok "nvmetcli ls"
|
||||
|
||||
tend
|
@ -1,34 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (c) 2016 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Author: Yi Zhang <yizhan@redhat.com>
|
||||
|
||||
#set -x
|
||||
source ../include/tc.sh || exit 200
|
||||
|
||||
tlog "running $0"
|
||||
|
||||
tok "yum -y reinstall nvmetcli"
|
||||
tok "yum -y remove nvmetcli"
|
||||
tok "yum -y install nvmetcli"
|
||||
tok "which nvmetcli"
|
||||
tok "yum info nvmetcli"
|
||||
tok "[[ -f "/usr/sbin/nvmetcli" ]]"
|
||||
tok "modprobe nvmet"
|
||||
tok "nvmetcli ls"
|
||||
|
||||
tend
|
@ -1,9 +0,0 @@
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
tests:
|
||||
- sanity
|
||||
required_packages:
|
||||
- which
|
Loading…
Reference in New Issue
Block a user