Make Remote.shortname actually short

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/orchestra/remote.py b/teuthology/orchestra/remote.py
index a9dd3595638f6ecfcf23e0d625924081c7375d94..63fce9ddca0a1d556ac9d4fc586f87be607c1e34 100644 (file)
--- a/teuthology/orchestra/remote.py
+++ b/teuthology/orchestra/remote.py
@@ -63,12 +63,9 @@ class Remote(object):
 
     @property
     def shortname(self):
-        """
-        shortname decorator
-        """
         name = self._shortname
         if name is None:
-            name = self.name
+            name = self.hostname.split('.')[0]
         return name
 
     @property
@@ -93,7 +90,7 @@ class Remote(object):
         return misc.get_system_type(self)
 
     def __str__(self):
-        return self.shortname
+        return self.name
 
     def __repr__(self):
         return '{classname}(name={name!r})'.format(

diff --git a/teuthology/orchestra/test/test_remote.py b/teuthology/orchestra/test/test_remote.py
index 25f14fc84685ccb02f367d7599c511727ff82561..663009b2e4317fa5d7f0945886dec67c35dda92e 100644 (file)
--- a/teuthology/orchestra/test/test_remote.py
+++ b/teuthology/orchestra/test/test_remote.py
@@ -13,14 +13,14 @@ class TestRemote(object):
             ssh=fudge.Fake('SSHConnection'),
             )
         assert r.shortname == 'xyz'
-        assert str(r) == 'xyz'
+        assert str(r) == 'jdoe@xyzzy.example.com'
 
     def test_shortname_default(self):
         r = remote.Remote(
             name='jdoe@xyzzy.example.com',
             ssh=fudge.Fake('SSHConnection'),
             )
-        assert r.shortname == 'jdoe@xyzzy.example.com'
+        assert r.shortname == 'xyzzy'
         assert str(r) == 'jdoe@xyzzy.example.com'
 
     @fudge.with_fakes