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

[nepi.git] / src / nepi / resources / linux / ccn / fibentry.py

diff --git a/src/nepi/resources/linux/ccn/fibentry.py b/src/nepi/resources/linux/ccn/fibentry.py
index 4b7e9c4..8712708 100644 (file)
--- a/src/nepi/resources/linux/ccn/fibentry.py
+++ b/src/nepi/resources/linux/ccn/fibentry.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 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
@@ -20,7 +19,7 @@
 from nepi.execution.attribute import Attribute, Flags, Types
 from nepi.execution.trace import Trace, TraceAttr
 from nepi.execution.resource import clsinit_copy, ResourceState, \
-    ResourceAction, reschedule_delay
+    ResourceAction
 from nepi.resources.linux.application import LinuxApplication
 from nepi.resources.linux.ccn.ccnd import LinuxCCND
 from nepi.util.timefuncs import tnow
@@ -35,7 +34,7 @@ import time
 
 @clsinit_copy
 class LinuxFIBEntry(LinuxApplication):
-    _rtype = "LinuxFIBEntry"
+    _rtype = "linux::FIBEntry"
 
     @classmethod
     def _register_attributes(cls):
@@ -139,7 +138,7 @@ class LinuxFIBEntry(LinuxApplication):
         # Wait until associated ccnd is provisioned
         if not self.ccnd or self.ccnd.state < ResourceState.READY:
             # ccnr needs to wait until ccnd is deployed and running
-            self.ec.schedule(reschedule_delay, self.deploy)
+            self.ec.schedule(self.reschedule_delay, self.deploy)
         else:
             if not self.get("ip"):
                 host = self.get("host")
@@ -182,12 +181,12 @@ class LinuxFIBEntry(LinuxApplication):
         if proc.poll():
             msg = "Failed to execute command"
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
         
     def configure(self):
         if self.trace_enabled("ping") and not self.ping:
             self.info("Configuring PING trace")
-            ping = self.ec.register_resource("LinuxPing")
+            ping = self.ec.register_resource("linux::Ping")
             self.ec.set(ping, "printTimestamp", True)
             self.ec.set(ping, "target", self.get("host"))
             self.ec.set(ping, "earlyStart", True)
@@ -198,7 +197,7 @@ class LinuxFIBEntry(LinuxApplication):
 
         if self.trace_enabled("traceroute") and not self.traceroute:
             self.info("Configuring TRACEROUTE trace")
-            traceroute = self.ec.register_resource("LinuxTraceroute")
+            traceroute = self.ec.register_resource("linux::Traceroute")
             self.ec.set(traceroute, "printTimestamp", True)
             self.ec.set(traceroute, "continuous", True)
             self.ec.set(traceroute, "target", self.get("host"))
@@ -217,7 +216,7 @@ class LinuxFIBEntry(LinuxApplication):
         else:
             msg = " Failed to execute command '%s'" % command
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def do_stop(self):
         command = self.get('command')
@@ -235,7 +234,7 @@ class LinuxFIBEntry(LinuxApplication):
             if err:
                 msg = " Failed to execute command '%s'" % command
                 self.error(msg, out, err)
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
 
     @property
     def _start_command(self):