Catch exception if an invalid tag is given when creating a tpg

Also, allow e.g "tpg6" as well as "6" for the tpg tag. This matches what
we do for lun creation.

Fixes #47

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

1 files changed, 13 insertions, 3 deletions

diff --git a/targetcli/ui_target.py b/targetcli/ui_target.py
index 5c8e2f4..a28925c 100644
--- a/targetcli/ui_target.py
+++ b/targetcli/ui_target.py
@@ -306,9 +306,10 @@ class UIMultiTPGTarget(UIRTSLibNode):
 
     def ui_command_create(self, tag=None):
         '''
-        Creates a new Target Portal Group within the target. The I{tag} must be
-        a strictly positive integer value. If omitted, the next available
-        Target Portal Group Tag (TPGT) will be used.
+        Creates a new Target Portal Group within the target. The
+        I{tag} must be a positive integer value, optionally prefaced
+        by 'tpg'. If omitted, the next available Target Portal Group
+        Tag (TPGT) will be used.
 
         SEE ALSO
         ========
@@ -316,6 +317,15 @@ class UIMultiTPGTarget(UIRTSLibNode):
         '''
         self.assert_root()
 
+        if tag:
+            if tag.startswith("tpg"):
+                tag = tag[3:]
+
+            try:
+                tag = int(tag)
+            except ValueError:
+                raise ExecutionError("Tag argument must be a number.")
+
         tpg = TPG(self.rtsnode, tag, mode='create')
         if self.shell.prefs['auto_enable_tpgt']:
             tpg.enable = True