applied the except and raise fixers to the master branch to close the gap with py3

[nepi.git] / src / nepi / resources / ns3 / ns3base.py

diff --git a/src/nepi/resources/ns3/ns3base.py b/src/nepi/resources/ns3/ns3base.py
index 00bdbfb..26632e0 100644 (file)
--- a/src/nepi/resources/ns3/ns3base.py
+++ b/src/nepi/resources/ns3/ns3base.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2014 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,20 +17,21 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 from nepi.execution.resource import ResourceManager, clsinit_copy, \
-        ResourceState, reschedule_delay
+        ResourceState
 from nepi.execution.attribute import Flags
 from nepi.execution.trace import TraceAttr
 
 @clsinit_copy
 class NS3Base(ResourceManager):
     _rtype = "abstract::ns3::Object"
-    _backend_type = "ns3"
+    _platform = "ns3"
 
     def __init__(self, ec, guid):
         super(NS3Base, self).__init__(ec, guid)
         self._uuid = None
         self._connected = set()
         self._trace_filename = dict()
+        self._node = None
 
     @property
     def connected(self):
@@ -47,10 +47,12 @@ class NS3Base(ResourceManager):
 
     @property
     def node(self):
-        from nepi.resources.ns3.ns3node import NS3BaseNode
-        nodes = self.get_connected(NS3BaseNode.get_rtype())
-        if nodes: return nodes[0]
-        return None
+        if not self._node:
+            from nepi.resources.ns3.ns3node import NS3BaseNode
+            nodes = self.get_connected(NS3BaseNode.get_rtype())
+            if nodes: self._node = nodes[0]
+
+        return self._node
 
     def trace(self, name, attr = TraceAttr.ALL, block = 512, offset = 0):
         filename = self._trace_filename.get(name)
@@ -80,7 +82,7 @@ class NS3Base(ResourceManager):
 
         kwargs = dict()
         for attr in self._attrs.values():
-            if not ( attr.has_flag(Flags.Construct) and attr.has_changed() ):
+            if not ( attr.has_flag(Flags.Construct) and attr.has_changed ):
                 continue
 
             kwargs[attr.name] = attr._value
@@ -104,9 +106,6 @@ class NS3Base(ResourceManager):
         return False
 
     def do_provision(self):
-        # TODO: create run dir for ns3 object !!!!
-        # self.simulation.node.mkdir(self.run_home)
-
         self._instantiate_object()
         self._connect_object()
         self._configure_object()
@@ -118,7 +117,7 @@ class NS3Base(ResourceManager):
     def do_deploy(self):
         if self._wait_rms():
             self.debug("---- RESCHEDULING DEPLOY ----" )
-            self.ec.schedule(reschedule_delay, self.deploy)
+            self.ec.schedule(self.reschedule_delay, self.deploy)
         else:
             self.do_discover()
             self.do_provision()
@@ -131,14 +130,14 @@ class NS3Base(ResourceManager):
             self.info("Starting")
             self.set_started()
         else:
-            msg = " Failed "
+            msg = "Failed"
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def do_stop(self):
         if self.state == ResourceState.STARTED:
             # No need to do anything, simulation.Destroy() will stop every object
-            self.info("Stopping command '%s'" % command)
+            self.info("Stopping")
             self.set_stopped()
     
     @property