From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Thu, 20 Mar 2014 00:56:07 +0000 (+0100)
Subject: Adding warning method to utils Logger
X-Git-Tag: nepi-3.1.0~101
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1a105e1e1e54145e1ffa6c280ba34afa66defc3c;p=nepi.git

Adding warning method to utils Logger
---

diff --git a/src/nepi/resources/planetlab/node.py b/src/nepi/resources/planetlab/node.py
index 8ea62fd6..681d4dd3 100644
--- a/src/nepi/resources/planetlab/node.py
+++ b/src/nepi/resources/planetlab/node.py
@@ -349,7 +349,7 @@ class PlanetlabNode(LinuxNode):
                 # the node is blacklisted, deleted from the slice, and a new
                 # node to provision is discovered
                 with PlanetlabNode.lock:
-                    self.warn(" Could not SSH login ")
+                    self.warning(" Could not SSH login ")
                     self._blacklist_node(node)
                     #self._delete_node_from_slice(node)
                 self.do_discover()
@@ -365,7 +365,7 @@ class PlanetlabNode(LinuxNode):
                 if out1.find("/proc type proc") < 0 or \
                     "Read-only file system".lower() in err2.lower():
                     with PlanetlabNode.lock:
-                        self.warn(" Corrupted file system ")
+                        self.warning(" Corrupted file system ")
                         self._blacklist_node(node)
                         #self._delete_node_from_slice(node)
                     self.do_discover()
@@ -537,7 +537,7 @@ class PlanetlabNode(LinuxNode):
                     ping_ok = self._do_ping(node_id)
                     if not ping_ok:
                         self._set_hostname_attr(node_id)
-                        self.warn(" Node not responding PING ")
+                        self.warning(" Node not responding PING ")
                         self._blacklist_node(node_id)
                     else:
                         # discovered node for provision, added to provision list
@@ -556,7 +556,7 @@ class PlanetlabNode(LinuxNode):
             self.plapi.add_slice_nodes(slicename, slice_nodes)
 
     def _delete_node_from_slice(self, node):
-        self.warn(" Deleting node from slice ")
+        self.warning(" Deleting node from slice ")
         slicename = self.get("username")
         self.plapi.delete_slice_node(slicename, [node])
 
@@ -611,7 +611,7 @@ class PlanetlabNode(LinuxNode):
         """
         Add node mal functioning node to blacklist
         """
-        self.warn(" Blacklisting malfunctioning node ")
+        self.warning(" Blacklisting malfunctioning node ")
         self.plapi.blacklist_host(node)
         if not self._hostname:
             self.set('hostname', None)
diff --git a/src/nepi/resources/planetlab/plcapi.py b/src/nepi/resources/planetlab/plcapi.py
index 742c3f02..97c48462 100644
--- a/src/nepi/resources/planetlab/plcapi.py
+++ b/src/nepi/resources/planetlab/plcapi.py
@@ -192,6 +192,7 @@ class PLCAPI(object):
             return self.api
         
     def test(self):
+        # TODO: Use nepi utils Logger instead of warning!!
         import warnings
         
         # validate XMLRPC server checking supported API calls
diff --git a/src/nepi/util/logger.py b/src/nepi/util/logger.py
index 9e6c2727..16c7e142 100644
--- a/src/nepi/util/logger.py
+++ b/src/nepi/util/logger.py
@@ -29,7 +29,7 @@ class Logger(object):
     def error(self, msg, out = None, err = None):
         self.log(msg, logging.ERROR, out, err)
 
-    def warn(self, msg, out = None, err = None):
+    def warning(self, msg, out = None, err = None):
         self.log(msg, logging.WARNING, out, err)
 
     def info(self, msg, out = None, err = None):
diff --git a/src/nepi/util/manifoldapi.py b/src/nepi/util/manifoldapi.py
index 81671059..c9ff344e 100644
--- a/src/nepi/util/manifoldapi.py
+++ b/src/nepi/util/manifoldapi.py
@@ -220,7 +220,7 @@ class MANIFOLDAPI(object):
         for field in fields:
             if field not in valid_fields:
                 fields.remove(field)
-                #self.warn(" Invalid Manifold field or filter ")
+                #self.warning(" Invalid Manifold field or filter ")
         
         return fields
 
diff --git a/src/nepi/util/sfa_api.py b/src/nepi/util/sfa_api.py
index f3df754c..e77c7259 100644
--- a/src/nepi/util/sfa_api.py
+++ b/src/nepi/util/sfa_api.py
@@ -24,6 +24,8 @@ import hashlib
 
 from sfa_sfav1 import SFAResourcesParser
 import subprocess
+
+# TODO: Use nepi utils Logger instead of warnings!
 import warnings
 
 import threading