From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Fri, 24 Jun 2011 15:18:18 +0000 (+0200)
Subject: get_traces now return also user
X-Git-Tag: nepi_v2_1~23
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4a392f7d8156bf751bb1cc3af02d6e434e5a4751;p=nepi.git

get_traces now return also user
---

diff --git a/src/nepi/core/execute.py b/src/nepi/core/execute.py
index 075b0a5f..ecd49c92 100644
--- a/src/nepi/core/execute.py
+++ b/src/nepi/core/execute.py
@@ -399,7 +399,9 @@ class ExperimentController(object):
     def traces_info(self):
         traces_info = dict()
         for guid, testbed in self._testbeds.iteritems():
-            traces_info[guid] = testbed.traces_info()
+            tinfo = testbed.traces_info()
+            if tinfo:
+                traces_info[guid] = testbed.traces_info()
         return traces_info
 
     @staticmethod
diff --git a/src/nepi/core/testbed_impl.py b/src/nepi/core/testbed_impl.py
index 92cfb937..cf1f9c16 100644
--- a/src/nepi/core/testbed_impl.py
+++ b/src/nepi/core/testbed_impl.py
@@ -463,8 +463,6 @@ class TestbedController(execute.TestbedController):
             fd.close()
         elif attribute == 'path':
             content = self.trace_filepath(guid, trace_id)
-        elif attribute == 'size':
-            content = str(self.traces_filesize(guid, trace_id))
         else:
             content = None
         return content
@@ -472,17 +470,15 @@ class TestbedController(execute.TestbedController):
     def traces_info(self):
         traces_info = dict()
         host = self._attributes.get_attribute_value("deployment_host")
+        user = self._attributes.get_attribute_value("deployment_user")
         for guid, trace_list in self._add_trace.iteritems(): 
             traces_info[guid] = dict()
             for trace_id in trace_list:
                 traces_info[guid][trace_id] = dict()
                 filepath = self.trace(guid, trace_id, attribute = "path")
-                # TODO: Filesize!
-                # filesize = self.trace(guid, trace_id)
-                filesize = -1
                 traces_info[guid][trace_id]["host"] = host
+                traces_info[guid][trace_id]["user"] = user
                 traces_info[guid][trace_id]["filepath"] = filepath
-                traces_info[guid][trace_id]["filesize"] = str(filesize)
         return traces_info
 
     def trace_filepath(self, guid, trace_id):
@@ -492,12 +488,6 @@ class TestbedController(execute.TestbedController):
         """
         raise NotImplementedError
 
-    def trace_filesize(self, guid, trace_id):
-        """
-        Return a trace's filesize in bytes
-        """
-        raise NotImplementedError
-
     #shutdown: NotImplementedError
 
     def get_connected(self, guid, connector_type_name, 
diff --git a/src/nepi/testbeds/planetlab/execute.py b/src/nepi/testbeds/planetlab/execute.py
index 63b035e3..f2d9eb2e 100644
--- a/src/nepi/testbeds/planetlab/execute.py
+++ b/src/nepi/testbeds/planetlab/execute.py
@@ -494,9 +494,6 @@ class TestbedController(testbed_impl.TestbedController):
                 content = None
         elif attribute == 'path':
             content = app.remote_trace_path(trace_id)
-        elif attribute == 'size':
-            # TODO
-            raise NotImplementedError
         else:
             content = None
         return content
diff --git a/test/core/execute.py b/test/core/execute.py
index 2c59ceb9..977e6171 100755
--- a/test/core/execute.py
+++ b/test/core/execute.py
@@ -55,7 +55,7 @@ class ExecuteTestCase(unittest.TestCase):
             7 : dict({
                 'fake': dict({
                     'host': 'localhost', 
-                    'filesize': '-1', 
+                    'user': 'root', 
                     'filepath': '<test>'
                     })
                 })
diff --git a/test/core/integration.py b/test/core/integration.py
index 4c0240b5..7ebdf0aa 100755
--- a/test/core/integration.py
+++ b/test/core/integration.py
@@ -198,7 +198,7 @@ class ExecuteTestCase(unittest.TestCase):
                 6: dict({ # element guid
                     'fake': dict({ # trace_id
                         'host': 'localhost', 
-                        'filesize': '-1', 
+                        'user': 'root', 
                         'filepath': '<test>'
                         })
                     })