Merge pull request #213 from mesosphere/task_with_host

add HOST column to task table

cli/dcoscli/tables.py

@@ -14,6 +14,7 @@ def task_table(tasks):
 
     fields = OrderedDict([
         ("NAME", lambda t: t["name"]),
+        ("HOST", lambda t: t.slave()["hostname"]),
         ("USER", lambda t: t.user()),
         ("STATE", lambda t: t["state"].split("_")[-1][0]),
         ("ID", lambda t: t["id"]),
@@ -21,6 +22,7 @@ def task_table(tasks):
 
     tb = util.table(fields, tasks, sortby="NAME")
     tb.align["NAME"] = "l"
+    tb.align["HOST"] = "l"
     tb.align["ID"] = "l"
 
     return tb

cli/tests/fixtures/task.py

@@ -1,4 +1,4 @@
-from dcos.mesos import Task
+from dcos.mesos import Slave, Task
 
 import mock
 
@@ -32,4 +32,6 @@ def task_fixture():
     }, None)
 
     task.user = mock.Mock(return_value='root')
+    slave = Slave({"hostname": "mock-hostname"})
+    task.slave = mock.Mock(return_value=slave)
     return task

cli/tests/unit/data/task.txt

@@ -1,2 +1,2 @@
- NAME      USER  STATE  ID                                            
- test-app  root    R    test-app.d44dd7f2-f9b7-11e4-bb43-56847afe9799 
+ NAME      HOST           USER  STATE  ID                                            
+ test-app  mock-hostname  root    R    test-app.d44dd7f2-f9b7-11e4-bb43-56847afe9799 

dcos/mesos.py

@@ -305,17 +305,27 @@ class Task(object):
         :returns: dictionary representation of this Task
         :rtype: dict
         """
+
         return self._task
 
     def framework(self):
         """Returns the task's framework
 
-        :returns" task's framework
+        :returns: task's framework
         :rtype: Framework
         """
 
         return self._master.framework(self["framework_id"])
 
+    def slave(self):
+        """Returns the task's slave
+
+        :returns: task's slave
+        :rtype: Slave
+        """
+
+        return self._master.slave(self["slave_id"])
+
     def user(self):
         """Task owner