From 3c7c2275b2d4660b83db9495c5f6ece5c6557b43 Mon Sep 17 00:00:00 2001
From: Jordan Augé <jordan.auge+fdio@cisco.com>
Date: Sat, 25 Mar 2017 02:00:42 +0100
Subject: Misc. improvements to vICN codebase detailed below.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- vICN core
 . Added python setup script (allowing package installation)
 . Better error handling
- Resources
 . LXD : better handling of certificate generation
 . Physical : generation of SSH keypair within vICN
 . Link : code simplification
 . EmulatedLteChannel: fixed typo in netmask configuration of emu-radio (missing /)
- Examples
 . Added json file for tutorial #2 - Dumbell
 . New tutorial #03 - Load balancing in WiFi/LTE hetnet
- Other minor changes incl. code cleanup (trailing spaces, etc.)

Change-Id: Id306ca71e27d9859aa72760f63a2bc364bfe8159
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
---
 vicn/core/task.py | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

(limited to 'vicn/core/task.py')

diff --git a/vicn/core/task.py b/vicn/core/task.py
index 2e9bc275..5aecb40b 100644
--- a/vicn/core/task.py
+++ b/vicn/core/task.py
@@ -34,7 +34,7 @@ log = logging.getLogger(__name__)
 EXECUTOR=concurrent.futures.ThreadPoolExecutor
 #EXECUTOR=concurrent.futures.ProcessPoolExecutor
 
-MAX_WORKERS=50 # None
+MAX_WORKERS = 50 # None
 
 class BaseTask:
     """Base class for all tasks
@@ -171,6 +171,27 @@ def get_attributes_task(resource, attribute_names):
         return {attribute_name: ret}
     return func()
 
+def _get_func_desc(f):
+    """
+    Returns a string representation of a function for logging purposes.
+
+    Todo: args and keywords (including from partial)
+    """
+    partial = isinstance(f, functools.partial)
+    if partial:
+        f = f.func
+
+    s = ''
+    if hasattr(f, '__name__'):
+        s += f.__name__
+    if hasattr(f, '__doc__') and f.__doc__:
+        if s:
+            s += ' : '
+        s += f.__doc__
+
+    return 'partial<{}>'.format(s) if partial else s
+
+
 class PythonTask(Task):
     def __init__(self, func, *args, **kwargs):
         super().__init__()
@@ -197,8 +218,8 @@ class PythonTask(Task):
         fut.add_done_callback(self._done_callback)
 
     def __repr__(self):
-        return '<Task[py] {} / {} {}>'.format(self._func, self._args, 
-                self._kwargs)
+        s = _get_func_desc(self._func)
+        return '<Task[py] {}>'.format(s) if s else '<Task[py]>'
 
 class PythonAsyncTask(PythonTask):
     async def execute(self, *args, **kwargs):
@@ -213,7 +234,8 @@ class PythonAsyncTask(PythonTask):
         fut.add_done_callback(self._done_callback)
 
     def __repr__(self):
-        return '<Task[apy]>'
+        s = _get_func_desc(self._func)
+        return '<Task[apy] {}>'.format(s) if s else '<Task[apy]>'
 
 class PythonInlineTask(PythonTask):
     async def execute(self, *args, **kwargs):
@@ -229,6 +251,10 @@ class PythonInlineTask(PythonTask):
             self._future.set_exception(e)
         return self._future
 
+    def __repr__(self):
+        s = _get_func_desc(self._func)
+        return '<Task[ipy] {}>'.format(s) if s else '<Task[ipy]>'
+
 class BashTask(Task):
     def __init__(self, node, cmd, parameters=None, parse=None, as_root=False,
             output=False, pre=None, post=None, lock=None):
@@ -339,12 +365,14 @@ class TaskManager:
         loop = asyncio.get_event_loop()
         loop.set_default_executor(executor)
 
-    def schedule(self, task):
+    def schedule(self, task, resource = None):
         """All instances of BaseTask can be scheduled
 
         Here we might decide to do more advanced scheduling, like merging bash
         tasks, etc. thanks to the task algebra.
         """
+        uuid = resource.get_uuid() if resource else '(unknown)'
+        log.info('Scheduling task {} for resource {}'.format(task, uuid))
         asyncio.ensure_future(task.execute())
 
 @task
-- 
cgit 1.2.3-korg