diff options
| author | Andy Grover <andy@groveronline.com> | 2013-10-11 14:29:17 -0700 |
|---|---|---|
| committer | Andy Grover <andy@groveronline.com> | 2013-10-11 14:29:17 -0700 |
| commit | 3fbe7e4ccd875298326e7e4dc390e51db2518070 (patch) | |
| tree | e98cf895c1572ce5a924f6d9ffd0100327a7e647 /rtslib/utils.py | |
| parent | cc7642baa47341635e264b4e370afe0b254c5caa (diff) | |
| parent | 55b4354a0408beb898e51b4725b3c64d33aefd7b (diff) | |
| download | rtslib-fb-3fbe7e4ccd875298326e7e4dc390e51db2518070.tar.gz | |
Merge pull request #33 from cvubrugier/2to3
2to3: preparatory work for python 3
Diffstat (limited to 'rtslib/utils.py')
| -rw-r--r-- | rtslib/utils.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rtslib/utils.py b/rtslib/utils.py index b8f6e05..f1091a2 100644 --- a/rtslib/utils.py +++ b/rtslib/utils.py @@ -268,7 +268,7 @@ def generate_wwn(wwn_type): return str(uuid.uuid4()) elif wwn_type == 'iqn': localname = socket.gethostname().split(".")[0] - localarch = os.uname()[4].replace("_","") + localarch = os.uname()[4].replace("_", "") prefix = "iqn.2003-01.org.linux-iscsi.%s.%s" % (localname, localarch) prefix = prefix.strip().lower() serial = "sn.%s" % str(uuid.uuid4())[24:] @@ -317,15 +317,15 @@ def normalize_wwn(wwn_types, wwn, possible_wwns=None): Returns (normalized_wwn, wwn_type), or exception if invalid wwn. ''' wwn_test = { - 'free' : lambda wwn: True, - 'iqn' : lambda wwn: \ + 'free': lambda wwn: True, + 'iqn': lambda wwn: \ re.match("iqn\.[0-9]{4}-[0-1][0-9]\..*\..*", wwn) \ and not re.search(' ', wwn) \ and not re.search('_', wwn), - 'naa' : lambda wwn: re.match("naa\.[125][0-9a-fA-F]{15}$", wwn), - 'eui' : lambda wwn: re.match("eui\.[0-9a-f]{16}$", wwn), - 'ib' : lambda wwn: re.match("ib\.[0-9a-f]{32}$", wwn), - 'unit_serial' : lambda wwn: \ + 'naa': lambda wwn: re.match("naa\.[125][0-9a-fA-F]{15}$", wwn), + 'eui': lambda wwn: re.match("eui\.[0-9a-f]{16}$", wwn), + 'ib': lambda wwn: re.match("ib\.[0-9a-f]{32}$", wwn), + 'unit_serial': lambda wwn: \ re.match("[0-9A-Fa-f]{8}(-[0-9A-Fa-f]{4}){3}-[0-9A-Fa-f]{12}$", wwn), } |