Fix cleanse_wwn to not put wrong wwn type on a wwn if it already has one

Signed-off-by: Andy Grover <agrover@redhat.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/rtslib/utils.py b/rtslib/utils.py
index 0b6447b..26f453f 100644
--- a/rtslib/utils.py
+++ b/rtslib/utils.py
@@ -502,12 +502,12 @@ def _cleanse_wwn(wwn_type, wwn):
     if wwn_type in ('naa', 'eui'):
         if wwn.startswith("0x"):
             wwn = wwn[2:]
-        elif wwn.startswith("naa.") or wwn.startswith("eui."):
-            wwn = wwn[4:]
         wwn = wwn.translate(None, ":-")
-        return wwn_type + "." + wwn
-    else:
-        return wwn
+
+        if not (wwn.startswith("naa.") or wwn.startswith("eui.")):
+            wwn = wwn_type + "." + wwn
+
+    return wwn
 
 def normalize_wwn(wwn_types, wwn, possible_wwns=None):
     '''