ceph_argparse.py: fix some ArgumentValid() commands

Fix raise call for ArgumentValid(): self has no member t, use
t directly. Moved one check in the correct block to avoide useless
checks.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py
index e9e4530c072c005b652139276efc101dc8511185..0c83fa12cd3d384624a436d6951e0a4ca53a7eb6 100644 (file)
--- a/src/pybind/ceph_argparse.py
+++ b/src/pybind/ceph_argparse.py
@@ -321,7 +321,7 @@ class CephName(CephArgtype):
         else:
             t, i = s.split('.')
             if not t in ('osd', 'mon', 'client', 'mds'):
-                raise ArgumentValid('unknown type ' + self.t)
+                raise ArgumentValid('unknown type ' + t)
             if t == 'osd':
                 if i != '*':
                     try:
@@ -349,11 +349,11 @@ class CephOsdName(CephArgtype):
             return
         if s.find('.') != -1:
             t, i = s.split('.')
+            if t != 'osd':
+                raise ArgumentValid('unknown type ' + t)
         else:
             t = 'osd'
             i = s
-        if t != 'osd':
-            raise ArgumentValid('unknown type ' + self.t)
         try:
             i = int(i)
         except: